From 1a85e9116325df58dfef43f5a3cfbd6c5d3819c0 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 19 九月 2024 14:15:59 +0800 Subject: [PATCH] 2024-09-19 朱宝民 获取简单用户信息接口 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml index 0896dac..e929674 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml @@ -490,7 +490,7 @@ CASE WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�' WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�' - WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾' + WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾' WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�' WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�' ELSE '鏈煡' @@ -506,7 +506,7 @@ CASE WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾' WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�' - WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾' + WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾' WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�' WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闂�' WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾' @@ -560,7 +560,7 @@ CASE WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�' WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�' - WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾' + WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾' WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�' WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�' ELSE '鏈煡' @@ -576,7 +576,7 @@ CASE WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾' WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�' - WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾' + WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾' WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�' WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闃�' WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾' @@ -623,7 +623,9 @@ SELECT COUNT(*) AS recordCount FROM rm_open_close_valve_history <where> - AND op_type = #{openType} + <if test="openType != null"> + AND op_type = #{openType} + </if> <if test="timeStart != null and timeStop != null"> AND op_dt BETWEEN #{timeStart} AND #{timeStop} </if> @@ -635,7 +637,9 @@ SELECT COUNT(*) AS recordCount FROM rm_open_close_valve_history <where> - AND cl_type = #{closeType} + <if test="closeType != null"> + AND cl_type = #{closeType} + </if> <if test="timeStart != null and timeStop != null"> AND cl_dt BETWEEN #{timeStart} AND #{timeStop} </if> -- Gitblit v1.8.0