From d730e2a289b38356e28a04b35a0cb2e7b4c6c282 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 七月 2025 10:27:56 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 9499940..2fc3c00 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -157,7 +157,7 @@
         1 AS auditStatus
     FROM se_card_operate ope
         INNER JOIN ba_user us ON ope.operator = us.id
-    WHERE Date(ope.operate_dt) = #{operateDate}
+    WHERE Date(ope.operate_dt) = #{operateDate} AND ope.operate_valid = 2
     GROUP BY ope.operator, Date(ope.operate_dt)
 
     UNION ALL
@@ -293,7 +293,8 @@
             WHEN ope.operate_type = 2 THEN '鍏呭��'
             WHEN ope.operate_type = 3 THEN '閿�鍗�'
             WHEN ope.operate_type = 4 THEN '琛ュ崱'
-            WHEN ope.operate_type = 5 THEN '杩旇繕'
+            WHEN ope.operate_type = 5 THEN '琛ユ墸'
+<!--            WHEN ope.operate_type = 6 THEN '杩旇繕'-->
         END AS operateType,
         Date(ope.operate_dt) AS tradeDate,
         COUNT(*) AS count,
@@ -365,4 +366,9 @@
       </if>
     </trim>
   </select>
+  <!-- 鍒犻櫎浠婂ぉ鐨勬�昏处-->
+  <delete id="deleteTodayGeneral">
+    DELETE FROM se_general
+    WHERE operate_date = DATE(NOW())
+  </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0