From c8b2311124fd5785b90d2fb4bd9ae0078aa13055 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 03 一月 2025 11:26:08 +0800
Subject: [PATCH] 1、查询农户年月的各日用水信息； 2、修改文档名称为《管系统系统增加一个客户的方法》； 3、增加一个文档《洒泉职业技术学院设备配置》。
---
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 >= #{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 >= #{startDt,jdbcType=DATE}
--
Gitblit v1.8.0