From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- 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