From 63970c57c337cabcb3d3d8c43860860c4f79e51b Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Tue, 21 Oct 2025 17:30:28 +0800
Subject: [PATCH] =?UTF-8?q?fit:=201=E3=80=81=E7=BB=B4=E6=9D=83=E7=9D=A3?=
 =?UTF-8?q?=E5=8A=9E=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=8A=93=E5=8F=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/controller/datav/RiskDataController.java  | 8 ++++----
 .../biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java | 2 +-
 .../biutag/supervision/service/BusinessDepartService.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/datav/RiskDataController.java b/src/main/java/com/biutag/supervision/controller/datav/RiskDataController.java
index 2c1814f..d0bfbec 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/RiskDataController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/RiskDataController.java
@@ -73,7 +73,7 @@ public class RiskDataController {
                 + beginTimeStr + " 00:00:00' AND '" + endTimeStr + " 23:59:59' GROUP BY a.membersCode, a.membersName ORDER BY problemNumber DESC LIMIT 10;";
         return Result.success(statisticsService.riskStatisticsBigOrg(sql, type));
     }
-
+//    --【民警 问题发生率】
     @GetMapping("/risk/police/a/statistics")
     public Result<List<RiskStatisticsVo>> riskPoliceAStatistics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, @RequestParam String type) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -89,7 +89,7 @@ public class RiskDataController {
         }
         return Result.success(statisticsService.riskStatisticsBigOrg(sql, "avgProblemNumber"));
     }
-
+//    -- 辅警/协警 问题发生率】
     @GetMapping("/risk/police/b/statistics")
     public Result<List<RiskStatisticsVo>> riskPoliceBStatistics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, @RequestParam String type) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -105,7 +105,7 @@ public class RiskDataController {
         }
         return Result.success(statisticsService.riskStatisticsBigOrg(sql, "problemNumber"));
     }
-
+//    -- 领导问题发生率
     @GetMapping("/risk/leader/statistics")
     public Result<List<RiskStatisticsVo>> riskLeaderStatistics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, @RequestParam String type) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -154,7 +154,7 @@ public class RiskDataController {
                 + beginTimeStr + " 00:00:00' AND '" + endTimeStr + " 23:59:59' GROUP BY a.membersCode, a.membersName ORDER BY problemNumber DESC LIMIT 10;";
         return Result.success(statisticsService.riskStatisticsBigOrg(sql, type));
     }
-
+//     【民警 问题数】
     @GetMapping("/police/a/negative/statistics")
     public Result<List<RiskStatisticsVo>> policeANegativeStatistics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, @RequestParam String type) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java
index 6b654e2..82bde87 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java
@@ -17,7 +17,7 @@ public class DwdAsjZfbaWfrwfxx {
     @TableField("xm")
     private String xm;
 
-    @TableField("clfs")
+    @TableField("clfsmc")
     private String clfs;
 
     @TableField("zjhm")
diff --git a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
index 32a6173..68f2df0 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
@@ -160,7 +160,7 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
 
     private static void generateBusinessDepartList(List<Date> happenTime, List<GBaseJJD> gBaseJJDSList, Map<String, Long> resultMap, Map<String, String> resultMap2, Map<String, String> resultMap3, List<Long> groupIds, List<BusinessDepart> businessDepartList, List<GBaseAJJBXX> gBaseAJJBXXListSA, List<GBaseAJJBXX> gBaseAJJBXXListLA, List<GBaseAJJBXX> gBaseAJJBXXListPA) {
         for (GBaseJJD gBaseJJD : gBaseJJDSList) {
-            Long groupId = resultMap.get(resultMap2.get(gBaseJJD.getGxdwdm()));
+            Long groupId = Long.valueOf(resultMap2.get(gBaseJJD.getGxdwdm()));
             if (groupId == null) {
                 continue;
             }
@@ -169,7 +169,7 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             businessDepartList.add(businessDepart);
         }
         for (GBaseAJJBXX gBaseAJJBXX : gBaseAJJBXXListSA) {
-            Long groupId = resultMap.get(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
+            Long groupId = Long.valueOf(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
             if (groupId == null) {
                 continue;
             }
@@ -178,7 +178,7 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             businessDepartList.add(businessDepart);
         }
         for (GBaseAJJBXX gBaseAJJBXX : gBaseAJJBXXListLA) {
-            Long groupId = resultMap.get(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
+            Long groupId = Long.valueOf(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
             if (groupId == null) {
                 continue;
             }
@@ -187,7 +187,7 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             businessDepartList.add(businessDepart);
         }
         for (GBaseAJJBXX gBaseAJJBXX : gBaseAJJBXXListPA) {
-            Long groupId = resultMap.get(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
+            Long groupId = Long.valueOf(resultMap2.get(gBaseAJJBXX.getBADWIDdm()));
             if (groupId == null) {
                 continue;
             }