From d1513a9ec3d0970193200dad5d17b54b3c2a924c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 八月 2024 13:41:03 +0800
Subject: [PATCH] 1、完善代码 2、增加了程序关闭时的事件钩子,以实现关闭程序时进行一些必要性处理。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 ac46b99..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,7 +161,10 @@
     from rm_intake_amount_day riad
     Left join pr_intake pint on pint.id = riad.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">
@@ -187,7 +190,10 @@
     from rm_intake_amount_day riad
     Left join pr_intake pint on pint.id = riad.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