From efa19855d33d76f68d22dd4fe978db041dda2f74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 08:47:37 +0800
Subject: [PATCH] 修改RTU上行数据log4j日志显示方式（首行换行）与内容（上行数据+命令应答数据）
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 785e7b2..aac929f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -140,7 +140,9 @@
SELECT
DISTINCT Date(ope.operate_dt) AS operateDate
FROM se_card_operate ope
- WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general) AND Date(ope.operate_dt) != CURDATE()
+ WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general)
+<!-- 鍙栨秷褰撳ぉ闄愬埗-->
+<!-- AND Date(ope.operate_dt) != CURDATE()-->
</select>
<!--鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級 -->
@@ -198,7 +200,7 @@
</if>
<if test = "auditStatus != null and auditStatus > 0">
- AND audit_status = ${auditStatus}
+ AND audit_status = #{auditStatus}
</if>
<if test = "operateDateStart != null and operateDateStop != null">
@@ -210,17 +212,18 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎬昏处璁板綍-->
<select id="getGenerals" resultType="com.dy.pipIrrGlobal.voSe.VoGeneral">
SELECT
- CAST(id AS char) AS generalId,
- CAST(cashier_id AS char) AS cashierId,
+ id AS generalId,
+ cashier_id AS cashierId,
cashier_name AS cashierName,
trade_amount AS tradeAmount,
gift,
refund_amount AS refundAmount,
+ (trade_amount + gift - refund_amount) AS totalAmount,
Date(operate_date) AS operateDate,
(CASE
- WHEN audit_status = 1 THEN "鏈鏍�"
- WHEN audit_status = 2 THEN "鍚屾剰"
- WHEN audit_status = 3 THEN "椹冲洖"
+ WHEN audit_status = 1 THEN '鏈鏍�'
+ WHEN audit_status = 2 THEN '鍚屾剰'
+ WHEN audit_status = 3 THEN '椹冲洖'
END) AS auditStatus
FROM se_general
<where>
@@ -229,7 +232,7 @@
</if>
<if test = "auditStatus != null and auditStatus > 0">
- AND audit_status = ${auditStatus}
+ AND audit_status = #{auditStatus}
</if>
<if test = "operateDateStart != null and operateDateStop != null">
@@ -255,11 +258,11 @@
</if>
<if test = "paymentId != null and paymentId >0">
- AND ope.payment_id = ${paymentId}
+ AND ope.payment_id = #{paymentId}
</if>
<if test = "cashierId != null and cashierId >0">
- AND ope.operator = ${cashierId}
+ AND ope.operator = #{cashierId}
</if>
</where>
GROUP BY ope.payment_id, Date(ope.operate_dt)
@@ -286,7 +289,7 @@
SELECT * FROM v_trade_summary
<where>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND cashierId = #{cashierId}
</if>
<if test = "timeStart != null and timeStop != null">
@@ -303,7 +306,7 @@
FROM v_trade_details
<where>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND cashierId = #{cashierId}
</if>
<if test = "tradeDate != null">
@@ -317,7 +320,7 @@
SELECT * FROM v_trade_details
<where>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND cashierId = #{cashierId}
</if>
<if test = "tradeDate != null">
--
Gitblit v1.8.0