From 690dcef9dfd265e9c556ae6c7a837384da15167b Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Thu, 13 Mar 2025 14:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-sy.yml     |  4 +--
 .../kms/yg/df/mapper/BsSgcDfAqrwMapper.java   |  4 +++
 .../kms/yg/res/service/AttResBaseService.java | 16 ++++++++++
 .../kms/yg/sz/mapper/BsSgcSzAqrwMapper.java   |  5 ++++
 .../mapper/yg/df/BsSgcDfAqrwMapper.xml        | 28 ++++++++++++++++++
 .../mapper/yg/sz/BsSgcSzAqrwMapper.xml        | 29 +++++++++++++++++++
 6 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java

diff --git a/shuili-admin/src/main/resources/application-sy.yml b/shuili-admin/src/main/resources/application-sy.yml
index 18b56e9f..8d35558c 100644
--- a/shuili-admin/src/main/resources/application-sy.yml
+++ b/shuili-admin/src/main/resources/application-sy.yml
@@ -11,7 +11,7 @@ shuili:
   # 实例演示开关
   demoEnabled: true
   # 临时文件地址
-  profile: E:/tianhui
+  profile: D:/tianhui
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -76,7 +76,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: redis
+    host: 127.0.0.1
     database: 2
 #    cluster:
 #     nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006
diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
index 76627922..ea107c09 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 水闸安全鉴定任务信息Mapper接口
@@ -48,4 +49,7 @@ public interface BsSgcDfAqrwMapper extends BaseMapper<BsSgcDfAqrw> {
     List<NumDto> getThree(@Param("adcd") String subString,
                           @Param("layer") Integer layer,
                           @Param("taskId") String taskId);
+
+    Map<String,Integer> getStatistics(@Param("startDate") String startDate, @Param("endDate")String endDate,
+                                      @Param("adcd")String xzqh, @Param("layer")String layer);
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java b/shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java
new file mode 100644
index 00000000..e1b0e012
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java
@@ -0,0 +1,16 @@
+package com.kms.yg.res.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.res.mapper.AttResBaseMapper;
+import com.kms.yg.res.domain.AttResBase;
+import org.springframework.stereotype.Service;
+/**
+ * 水库基本信息Service接口
+ *
+ * @author kms
+ * @date 2025-03-12
+ */
+@Service
+public class AttResBaseService extends BaseService<AttResBaseMapper, AttResBase>{
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
index 58043c8d..4671cfcd 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
@@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 水闸安全鉴定任务信息Mapper接口
@@ -49,4 +50,8 @@ public interface BsSgcSzAqrwMapper extends BaseMapper<BsSgcSzAqrw> {
     List<NumDto> getThree(@Param("adcd") String subString,
                           @Param("layer") Integer layer,
                           @Param("taskId") String taskId);
+
+
+    Map<String,Integer> getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate,
+                                      @Param("adcd")String xzqh,@Param("layer")String layer);
 }
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
index fc6dc413..830f6284 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
@@ -114,6 +114,34 @@
         </if>
     </select>
 
+    <select id="getStatistics" resultType="Map">
+        SELECT  COUNT(1) num,
+        COUNT(CASE WHEN ss.status = '3' THEN 1 END) completedNum,
+        COUNT(CASE WHEN ss.status != '3' THEN 1 END) uncompletedNum,
+        ROUND(COUNT(CASE WHEN ss.PLAN_TIME > ss.COMPLETION_TIME THEN  1 END )/COUNT(1),2) as overTimeNumPercent,
+        ROUND(COUNT(CASE WHEN ss.status = '3' THEN 1 END)/COUNT(1),2)*100 as  completedPercent,
+        ROUND(COUNT(CASE WHEN ss.status != '3' THEN 1 END)/COUNT(1),2)*100 as underWayPercent
+
+        FROM bs_sgc_df_dfrw ss
+        LEFT JOIN att_dike_base sj ON sj.dike_CODE = ss.dike_code
+        <if test="adcd != null and adcd != ''and adcd != null and adcd != ''">
+            <if test="layer==5">
+                and sj.adcd like  concat(LEFT(#{adcd},2),'%')
+            </if>
+            <if test="layer==4">
+                and sj.adcd like  concat(LEFT(#{adcd},4),'%')
+            </if>
+            <if test="layer==3">
+                and sj.adcd like  concat(LEFT(#{adcd},6),'%')
+            </if>
+        </if>
+        <if test="startDate != null">
+            AND sj.create_time >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            AND sj.create_time <= #{endDate}
+        </if>
+    </select>
 
 
 </mapper>
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
index 2f3648e0..a1918ca2 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
@@ -115,6 +115,35 @@
         </if>
     </select>
 
+    <select id="getStatistics" resultType="Map">
+        SELECT  COUNT(1) num,
+        COUNT(CASE WHEN ss.status = '3' THEN 1 END) completedNum,
+        COUNT(CASE WHEN ss.status != '3' THEN 1 END) uncompletedNum,
+        ROUND(COUNT(CASE WHEN ss.PLAN_TIME > ss.COMPLETION_TIME THEN  1 END )/COUNT(1),2) as overTimeNumPercent,
+        ROUND(COUNT(CASE WHEN ss.status = '3' THEN 1 END)/COUNT(1),2)*100 as  completedPercent,
+        ROUND(COUNT(CASE WHEN ss.status != '3' THEN 1 END)/COUNT(1),2)*100 as underWayPercent
+
+        FROM bs_sgc_sz_szrw ss
+        LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code
+        <if test="adcd != null and adcd != ''and adcd != null and adcd != ''">
+            <if test="layer==5">
+                and sj.adcd like  concat(LEFT(#{adcd},2),'%')
+            </if>
+            <if test="layer==4">
+                and sj.adcd like  concat(LEFT(#{adcd},4),'%')
+            </if>
+            <if test="layer==3">
+                and sj.adcd like  concat(LEFT(#{adcd},6),'%')
+            </if>
+        </if>
+        <if test="startDate != null">
+            AND sj.create_time >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            AND sj.create_time <= #{endDate}
+        </if>
+    </select>
+
 
 
 </mapper>