From 7b1a2397b373fe3366460a346de306ad9b5c5753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Wed, 5 Mar 2025 20:04:06 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B0=B4=E9=97=B8=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yxgh/df/mapper/DfRecordMapper.java    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
index 8c329e40..5c77db56 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
@@ -30,8 +30,9 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
         "select count(*) from bs_sgc_df_xsjhjlz where RECORD_ID " +
         "in (   "+
         "select jl.id from bs_sgc_df_xsjhjl  as jl "+
+        "left join att_dike_base base on base.dike_code=jl.dike_code"+
         "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
-        "left join att_dike_base base on base.dike_code=jl.dike_code and df.adcd like concat(#{dto.adcdQx}, '%')  "+
+        " and df.adcd like concat(#{dto.adcdQx}, '%')  "+
         "</if> "+
         "group by jl.DIKE_CODE,jl.id "+
         ") "+
@@ -50,25 +51,26 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
 
 
     @Select("<script>" +
-            "select adb.adcd,lz.problem,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
+            "select adb.adcd,lz.status as problem,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
             "left join bs_sgc_df_xsjhjl  hj on hj.id=lz.RECORD_ID "+
+            "left join att_dike_base base on base.dike_code=hj.dike_code "+
             "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
-            "left join att_dike_base base on base.dike_code=hj.dike_code and base.adcd like concat(#{dto.adcdQx}, '%')  "+
+            "AND base.adcd like concat(#{dto.adcdQx}, '%')  "+
             "</if> "+
             "where 1=1  "+
             "<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
-            "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
-            "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
+            "AND (DATE_FORMAT(lz.create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
+            "AND DATE_FORMAT(lz.create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
             "<if test='dto.problem != null and dto.problem != \"\"'> " +
             "AND lz.status=#{dto.problem} "+
             "</if> " +
-            "group by adb.adcd ,lz.problem "+
+            "group by base.adcd ,lz.status "+
             "</script>")
     List<DfYhHiddenDangerModel> yhNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);
 
     @Select("<script>" +
-            "select adb.adcd,lz.handle_status,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
+            "select base.adcd,lz.handle_status,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
             "left join bs_sgc_df_xsjhjl  hj on hj.id=lz.RECORD_ID "+
             "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
             "left join att_dike_base base on base.dike_code=hj.dike_code and base.adcd like concat(#{dto.adcdQx}, '%')  "+
@@ -78,13 +80,13 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "</if> " +
             "where 1=1  "+
             "<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
-            "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
-            "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
+            "AND (DATE_FORMAT(lz.create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
+            "AND DATE_FORMAT(lz.create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
             "<if test='dto.problem != null  and dto.problem != \"\"'> "+
             "AND lz.status=#{dto.problem} "+
             "</if> " +
-            "group by adb.adcd ,lz.handle_status "+
+            "group by base.adcd ,lz.handle_status "+
             "</script>")
     List<DfYhHiddenDangerModel> clfNumberData(@Param("dto") DfYhHiddenDangerQueDto dto);