From a1744d0bf7f0ad8ac861d672cffd7c710dac4e7e Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 11 四月 2025 14:17:36 +0800 Subject: [PATCH] 获取未绑定轮灌组的取水口 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml index 884118b..cb93292 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml @@ -390,16 +390,16 @@ <if test="valveState != null"> and rasl.valve_state = #{valveState,jdbcType=TINYINT} </if> - <if test="intakeId != null"> - and rasl.intake_id = #{intakeId} + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} </if> - <if test="intakeName != null"> + <if test="intakeName != null and intakeName != '' "> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> - <if test="startDt != null"> + <if test="startDt != null and startDt != ''"> and rasl.dt >= #{startDt,jdbcType=TIMESTAMP} </if> - <if test="endDt != null"> + <if test="endDt != null and endDt != ''"> and rasl.dt <= #{endDt,jdbcType=TIMESTAMP} </if> </where> @@ -474,16 +474,16 @@ <if test="valveState != null"> and rasl.valve_state = #{valveState,jdbcType=TINYINT} </if> - <if test="intakeId != null"> - and rasl.intake_id = #{intakeId} + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} </if> - <if test="intakeName != null"> + <if test="intakeName != null and intakeName != '' "> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> - <if test="startDt != null"> + <if test="startDt != null and startDt != ''"> and rasl.dt >= #{startDt,jdbcType=TIMESTAMP} </if> - <if test="endDt != null"> + <if test="endDt != null and endDt != ''"> and rasl.dt <= #{endDt,jdbcType=TIMESTAMP} </if> </where> -- Gitblit v1.8.0