From d38bb7f88d0c499265e6da62a52686a654834daa Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 03 八月 2024 08:59:29 +0800
Subject: [PATCH] 2024-08-03 朱宝民 优化获取命令日志历史记录接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
index 4def2f1..96ecc72 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -161,11 +161,11 @@
     from rm_intake_amount_day riad
     Left join pr_intake pint on pint.id = riad.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 riad.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riad.dt &gt;= #{startDt,jdbcType=DATE}
@@ -190,11 +190,11 @@
     from rm_intake_amount_day riad
     Left join pr_intake pint on pint.id = riad.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 riad.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riad.dt &gt;= #{startDt,jdbcType=DATE}

--
Gitblit v1.8.0