From 4f6a87494a6117ba10e4f0769bcd59a5bd30474d Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期四, 01 八月 2024 15:51:40 +0800 Subject: [PATCH] 远程测控八个接口解决bug --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml index f3dfb90..bce4740 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml @@ -165,11 +165,11 @@ from rm_loss_day_last rldl Left join pr_intake pint on pint.id = rldl.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} </if> - <if test="intakeId != null"> - and rldl.intake_id = #{intakeId} + <if test="intakeName != null and intakeName != '' "> + and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> and rldl.dt >= #{startDt,jdbcType=DATE} @@ -193,11 +193,11 @@ from rm_loss_day_last rldl Left join pr_intake pint on pint.id = rldl.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') + <if test="intakeId != null and intakeId != '' "> + and rash.intake_id = #{intakeId} </if> - <if test="intakeId != null"> - and rldl.intake_id = #{intakeId} + <if test="intakeName != null and intakeName != '' "> + and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') </if> <if test="startDt != null"> and rldl.dt >= #{startDt,jdbcType=DATE} -- Gitblit v1.8.0