From 908ac70b81dcf59b575838df5d4e27927a99ddc7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 七月 2024 09:08:59 +0800
Subject: [PATCH] 8个接口增加可以通过取水口ID或农户ID查询
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 2134c01..187f1e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -379,7 +379,7 @@
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rasl.intake_id = #{intakeId}
</if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
@@ -463,7 +463,7 @@
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rasl.intake_id = #{intakeId}
</if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index 2446e7e..997fdf5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -198,7 +198,7 @@
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
<if test="clientId != null">
- and rcad.client_id = #{clientId}
+ and rcadl.client_id = #{clientId}
</if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
@@ -229,7 +229,7 @@
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
<if test="clientId != null">
- and rcad.client_id = #{clientId}
+ and rcadl.client_id = #{clientId}
</if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
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..0c1693a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
@@ -177,7 +177,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and riadl.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
@@ -206,7 +206,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and riadl.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
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 72263b5..4def2f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -165,7 +165,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and riad.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
@@ -194,7 +194,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and riad.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index 972b0df..c0b3971 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -169,7 +169,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rldl.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
@@ -197,7 +197,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rldl.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index 6c10de8..ddea63e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -159,7 +159,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rld.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
@@ -187,7 +187,7 @@
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rld.intake_id = #{intakeId}
</if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
--
Gitblit v1.8.0