From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 16:09:11 +0800 Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 14c712e..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,11 +173,11 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') - </if> - <if test="intakeId != 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"> and riadl.dt >= #{startDt,jdbcType=DATE} @@ -202,12 +202,12 @@ from rm_intake_amount_day_last riadl Left join pr_intake pint on pint.id = riadl.intake_id <where> - <if test="intakeName != null"> - and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%') - </if> - <if test="intakeId != 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"> and riadl.dt >= #{startDt,jdbcType=DATE} </if> -- Gitblit v1.8.0