From 365f1ff8f0275f9e1d4b60c444ef3387149a47ce Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期二, 27 八月 2024 11:43:18 +0800 Subject: [PATCH] 指定时间为上线的取水口 修改传参限制 获取指定信号强度的取水口 修改传参限制 根据开阀类型获取操作次数 修改传参限制 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml index ea0db3b..915a04f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml @@ -173,7 +173,10 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != null"> + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} + </if> + <if test="intakeName != null and intakeName != '' "> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> @@ -199,7 +202,10 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != null"> + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} + </if> + <if test="intakeName != null and intakeName != '' "> and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> -- Gitblit v1.8.0