From c60767599cf741fde1cb7a10544d8c0ebb8db6a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:33 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定月份各天漏算了、统计指定年份各月漏算量

---
 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 0c1693a..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 test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeId != null">
-        and riadl.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riadl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -202,11 +202,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 test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeId != null">
-        and riadl.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riadl.dt &gt;= #{startDt,jdbcType=DATE}

--
Gitblit v1.8.0