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> 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> 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> 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> 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 happenTime, List gBaseJJDSList, Map resultMap, Map resultMap2, Map resultMap3, List groupIds, List businessDepartList, List gBaseAJJBXXListSA, List gBaseAJJBXXListLA, List 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