From 532ef2e6163252e90ca870b7517eda6087f681a3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 29 Jul 2024 22:38:58 +0800
Subject: [PATCH] 人工上报排序

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
index ff2707f..1e948bb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -56,7 +56,7 @@
 
 
     <select id="selectReportFloodRecordPages" resultMap="vo">
-        SELECT R.*,
+        SELECT R.*,arfl."tb_flse_lim_stag" tbFlseLimStag,r.main_z - arfl."tb_flse_lim_stag" mainBe,r.person_rz - arfl."tb_flse_lim_stag" personBe,
         arb."name" reservoirName ,
 
         arb."res_reg_code" as resRegCode,
@@ -88,6 +88,7 @@
         LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid"
         LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid"
         LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
+        left join sjzt_md."att_res_flse_lim" arfl on arfl."res_guid" = arb."guid" and arfl."is_use" = 1
 
         WHERE r.is_deleted = 0
         <if test=" reportFloodRecord.adCode!= null and reportFloodRecord.adCode !='' ">
@@ -103,13 +104,22 @@
             AND r.reservoir_id = #{reportFloodRecord.reservoirId}
         </if>
         <if test="reportFloodRecord.startTime !=null and reportFloodRecord.startTime !=''">
-            AND DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= #{reportFloodRecord.startTime}
+            AND DATE_FORMAT(r.report_time,'%Y-%m-%d') &gt;= #{reportFloodRecord.startTime}
         </if>
         <if test="reportFloodRecord.endTime !=null and reportFloodRecord.endTime !=''">
-            AND DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= #{reportFloodRecord.endTime}
+            AND DATE_FORMAT(r.report_time,'%Y-%m-%d') &lt;= #{reportFloodRecord.endTime}
         </if>
         <if test="reportFloodRecord.createUser !=null and reportFloodRecord.createUser !=''">
             AND r.create_user = #{reportFloodRecord.createUser}
+        </if>
+        <if test="reportFloodRecord.isOver !=null and reportFloodRecord.isOver !=''">
+            AND r.is_over = #{reportFloodRecord.isOver}
+        </if>
+        <if test="reportFloodRecord.isStatus !=null and reportFloodRecord.isStatus !=''">
+            AND r.status = #{reportFloodRecord.isStatus}
+        </if>
+        <if test="reportFloodRecord.gateStatus !=null and reportFloodRecord.gateStatus !=''">
+            AND r.gate_status = #{reportFloodRecord.gateStatus}
         </if>
 
         <if test="reportFloodRecord.resRegCode != null and reportFloodRecord.resRegCode != ''">
@@ -123,7 +133,7 @@
         </if>
 
 
-        ORDER BY CREATE_TIME DESC
+        --ORDER BY CREATE_TIME DESC
     </select>
     <select id="customizeGetDetail" resultMap="vo">
 

--
Gitblit v1.9.3