From 7e1c0da05c518341d82230239c5fff61cf2ebe15 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 26 七月 2024 14:39:50 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 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 98990c4..187f1e9 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml @@ -378,6 +378,9 @@ <if test="valveState != null"> and rasl.valve_state = #{valveState,jdbcType=TINYINT} </if> + <if test="intakeId != null"> + and rasl.intake_id = #{intakeId} + </if> <if test="intakeName != null"> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> @@ -459,6 +462,9 @@ <if test="valveState != null"> and rasl.valve_state = #{valveState,jdbcType=TINYINT} </if> + <if test="intakeId != null"> + and rasl.intake_id = #{intakeId} + </if> <if test="intakeName != null"> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> -- Gitblit v1.8.0