From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 16:09:11 +0800 Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 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..d42ffae 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml @@ -294,6 +294,7 @@ WHEN ope.operate_type = 3 THEN '閿�鍗�' WHEN ope.operate_type = 4 THEN '琛ュ崱' WHEN ope.operate_type = 5 THEN '杩旇繕' + WHEN ope.operate_type = 10 THEN '鍙嶅啓' END AS operateType, Date(ope.operate_dt) AS tradeDate, COUNT(*) AS count, @@ -304,7 +305,7 @@ FROM se_card_operate ope INNER JOIN ba_user us ON us.id = ope.operator <where> - AND ope.operate_type IN(1,2,3,4,5) + AND ope.operate_type IN(1,2,3,4,5,10) AND ope.operate_valid = 2 <if test = "cashierId != null and cashierId > 0"> AND us.id = #{cashierId} -- Gitblit v1.8.0