From d736d220008f3ddaed44ac6bfa8a19eb8ca61e96 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 12 十月 2024 14:09:39 +0800 Subject: [PATCH] 1、江海协议功能C2增加订单号数据项; 2、下行命令构造时标TP当月份大于等于10时有错,进行修改。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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..53147f1 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml @@ -390,10 +390,10 @@ <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"> @@ -474,10 +474,10 @@ <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"> -- Gitblit v1.8.0