From 156fd9f67912e73b46c02ffe325ea24f21b47720 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 11:55:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java |    3 +++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml                                        |   11 +++++++----
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml                             |    2 +-
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml                                    |   11 +++++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

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 f70b447..db01039 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -181,6 +181,9 @@
             <if test="intakeName != null and intakeName != ''">
                 and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="lossAmountGreaterOrEqual != null ">
+                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+            </if>
             <if test="startDt != null">
                 and rldl.dt &gt;= #{startDt,jdbcType=DATE}
             </if>
@@ -208,6 +211,9 @@
             <if test="intakeName != null and intakeName != ''">
                 and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="lossAmountGreaterOrEqual != null ">
+                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+            </if>
             <if test="startDt != null">
                 and rldl.dt &gt;= #{startDt,jdbcType=DATE}
             </if>
@@ -215,10 +221,7 @@
                 and rldl.dt &lt;= #{endDt,jdbcType=DATE}
             </if>
         </where>
-        ORDER BY rldl.dt DESC, rldl.loss_amount DESC
-        <!--    <if test="pageCurr != null and pageSize != null">-->
-        <!--      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}-->
-        <!--    </if>-->
+        ORDER BY rldl.dt_last DESC
         <trim prefix="limit ">
             <if test="start != null and count != null">
                 #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
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 cc13cf9..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -161,6 +161,9 @@
       <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -189,6 +192,9 @@
       <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -196,10 +202,7 @@
         and rld.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rld.dt DESC , rld.loss_amount DESC
-<!--    <if test="pageCurr != null and pageSize != null">-->
-<!--      LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
-<!--    </if>-->
+    ORDER BY rld.id DESC
     <trim prefix="limit " >
       <if test="start != null and count != null">
         #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 034e12f..ec4f68d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -522,7 +522,7 @@
         oh.cl_total_amount      AS closeTotalAmount
         FROM rm_open_close_valve_last oh
         LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
-        LEFT JOIN ba_client cl ON cl.id = oh.client_id
+        LEFT JOIN se_client cl ON cl.id = oh.client_id
         <where>
             <if test="intakeId != null and intakeId > 0">
                 AND oh.intake_id = #{intakeId}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
index 840a42a..fd33e19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
@@ -30,6 +30,9 @@
     @Schema(description = "鍙栨按鍙D")
     private String intakeId;
 
+    @Schema(description = "婕忔崯澶т簬绛変簬")
+    private Double lossAmountGreaterOrEqual;
+
     @Schema(description = "缁熻寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")

--
Gitblit v1.8.0