大屏后端问题类型占比更新

src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java

@@ -57,12 +57,11 @@ public class DataGobalController {
         // 业务类型占比
         List<EchartsVo> ywzblist = dataGobalService.getBusinessRate(beginTime, endTime);
 
-        // 问题类型占比
-        List<EchartsVo> wtlxlist = dataGobalService.getProblemRate(beginTime, endTime);
-
         // 突出问题排名
         List<StrongProblemRank> tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime);
 
+        // 问题类型占比
+        List<EchartsVo> wtlxlist = dataGobalService.getProblemRate(beginTime, endTime);
 
         // 查所有的市局
      List<GobalMapIconVo> gobalTempMapVoList =  dataGobalService.getMapIconInfo(beginTime, endTime);

src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java

@@ -33,7 +33,7 @@ public class SupervisionNotifyController {
     private final DataSupervisionNotifyServiceImpl dataSupervisionNotifyService;
 
     /**
-     * 获取所有现场督察钟中央总数数量
+     * 获取现场督察大屏中央总数数量
      *
      * @return
      */
@@ -49,7 +49,7 @@ public class SupervisionNotifyController {
 
     /**
      * 获取日常督察排行
-     * @param groupType 分组类型      1: 分县市局 2: 局属单位
+     * @param groupType 分组类型    1: 分县市局 2: 局属单位
      * @return
      */
     @Operation(summary = "获取日常督察数量概览和整改率排名")

src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@@ -179,6 +179,9 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "AND ng.checkStatus<>3 AND problemSourcesCode=26 " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoSjdc(Date beginTime, Date endTime, Integer departId);
+
+    @Select("select id from negative where discovury_time between #{beginTime} and #{endTime}")
+    List<Long> selectNegativeIdsByTime(Date beginTime, Date endTime);
 // endregion
 
 }

src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java

@@ -13,77 +13,41 @@ import java.util.List;
 public interface NegativeProblemRelationMapper extends BaseMapper<NegativeProblemRelation> {
 
 
-    @Select("SELECT  npr.oneLevelContent as name, count(*) value " +
+    /**
-            "FROM negative_problem_relation npr " +
+     * 首页大屏问题类型占比
-            "WHERE npr.oneLevelContent is not NULL " +
+     * @param beginTime
-            "GROUP BY `name` ")
+     * @param endTime
+     * @return
+     */
+    @Select("SELECT npr.oneLevelContent, count(*) `value` FROM negative_problem_relation npr INNER JOIN " +
+            "  ( " +
+            "      SELECT id FROM negative ng " +
+            "      WHERE checkStatus <>3 " +
+            "      AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " +
+            "  ) as temp " +
+            "on npr.negativeId=temp.id " +
+            "AND npr.oneLevelContent is not NULL " +
+            "GROUP BY npr.oneLevelContent " +
+            "ORDER BY `value` desc")
     List<EchartsVo> selectProblemRate(Date beginTime, Date endTime);
 
-    @Select("SELECT threeLevelContent as label,  count(*) as `value` " +
+    /**
-            "FROM negative_problem_relation " +
+     * 首页大屏突出问题排名
-            "WHERE negativeId " +
+     * @param beginTime
-            "in ( SELECT id FROM negative WHERE discoveryTime BETWEEN #{beginTime} AND #{endTime}) " +
+     * @param endTime
-            "GROUP BY threeLevelContent " +
+     * @return
-            "ORDER BY VALUE DESC ")
+     */
+    @Select("SELECT npr.threeLevelContent as labe, count(*) `value` FROM negative_problem_relation npr INNER JOIN " +
+            "  ( " +
+            "      SELECT id FROM negative ng " +
+            "      WHERE checkStatus <>3 " +
+            "      AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " +
+            "  ) as temp " +
+            "on npr.negativeId=temp.id " +
+            "AND npr.threeLevelContent is not NULL " +
+            "GROUP BY npr.threeLevelContent " +
+            "ORDER BY `value` desc")
     List<StrongProblemRank> selectStrongProblemRank(Date beginTime, Date endTime);
 
-    @Select("SELECT sd1.short_name,  count(*) value " +
-            "FROM negative ng " +
-            "INNER JOIN sup_depart sd " +
-            "on ng.involveDepartId=sd.id AND sd.`level`=3  " +
-            "AND checkStatus=1 AND problemSourcesCode in(13, 14, 15, 16) " +
-            "AND ng.discoveryTime BETWEEN #{beginTime} and #{endTime}" +
-            "INNER JOIN sup_depart sd1 " +
-            "on sd.pid=sd1.id and sd1.statistics_group_id=3\n" +
-            "GROUP BY sd1.id  " +
-            "ORDER BY `value` DESC;")
-    List<CommonVo> selectSuperviseProTotal(Date beginTime, Date endTime);
 
-    @Select("SELECT sd1.short_name,  count(*) value " +
-            "FROM negative ng " +
-            "INNER JOIN sup_depart sd " +
-            "on ng.involveDepartId=sd.id AND sd.`level`=3  " +
-            "AND checkStatus=1 AND problemSourcesCode in(17, 18, 19, 20) " +
-            "AND ng.discoveryTime BETWEEN #{beginTime} and #{endTime}" +
-            "INNER JOIN sup_depart sd1 " +
-            "on sd.pid=sd1.id and sd1.statistics_group_id=3\n" +
-            "GROUP BY sd1.id  " +
-            "ORDER BY `value` DESC;")
-    List<CommonVo> selectCaseVerifyProTotal(Date beginTime, Date endTime);
-
-    @Select("SELECT sd1.short_name,  count(*) value " +
-            "FROM negative ng " +
-            "INNER JOIN sup_depart sd " +
-            "on ng.involveDepartId=sd.id AND sd.`level`=3  " +
-            "AND checkStatus=1 AND problemSourcesCode in(21, 22, 23, 24, 25) " +
-            "AND ng.discoveryTime BETWEEN #{beginTime} and #{endTime}" +
-            "INNER JOIN sup_depart sd1 " +
-            "on sd.pid=sd1.id and sd1.statistics_group_id=3\n" +
-            "GROUP BY sd1.id  " +
-            "ORDER BY `value` DESC;")
-    List<CommonVo> selectMailProTotal(Date beginTime, Date endTime);
-
-    @Select("SELECT sd1.short_name,  count(*) value " +
-            "FROM negative ng " +
-            "INNER JOIN sup_depart sd " +
-            "on ng.involveDepartId=sd.id AND sd.`level`=3  " +
-            "AND checkStatus=1 AND problemSourcesCode in(2) " +
-            "AND ng.discoveryTime BETWEEN #{beginTime} and #{endTime}" +
-            "INNER JOIN sup_depart sd1 " +
-            "on sd.pid=sd1.id and sd1.statistics_group_id=3\n" +
-            "GROUP BY sd1.id  " +
-            "ORDER BY `value` DESC;")
-    List<CommonVo> selectPoliceProTotal(Date beginTime, Date endTime);
-
-    @Select("SELECT sd1.short_name,  count(*) value " +
-            "FROM negative ng " +
-            "INNER JOIN sup_depart sd " +
-            "on ng.involveDepartId=sd.id AND sd.`level`=3  " +
-            "AND checkStatus=1 AND problemSourcesCode in(26) " +
-            "AND ng.discoveryTime BETWEEN #{beginTime} and #{endTime}" +
-            "INNER JOIN sup_depart sd1 " +
-            "on sd.pid=sd1.id and sd1.statistics_group_id=3\n" +
-            "GROUP BY sd1.id  " +
-            "ORDER BY `value` DESC;")
-    List<CommonVo> selectReviewProTotal(Date beginTime, Date endTime);
 }

src/main/java/com/biutag/supervision/service/DataGobalService.java

@@ -57,7 +57,7 @@ public class DataGobalService {
                 beginTime, endTime,
                 21, 22, 23, 24, 25);
         // 警务评议问题数量(查实版本)
-        Long reviewPro = getCountByConditions(
+        Long talkPro = getCountByConditions(
                 Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
                 beginTime, endTime,
                 2);
@@ -66,13 +66,13 @@ public class DataGobalService {
                 Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
                 beginTime, endTime,
                 26);
-        Long totalPro = caseVerificationPro + supervisionPro + complaintPro + reviewPro + auditPro;
+        Long totalPro = caseVerificationPro + supervisionPro + complaintPro + talkPro + auditPro;
         JSONObject overview = new JSONObject();
         overview.fluentPut("totalPro", totalPro)
-                .fluentPut("caseVerificationPro", caseVerificationPro)
                 .fluentPut("supervisionPro", supervisionPro)
+                .fluentPut("caseVerificationPro", caseVerificationPro)
                 .fluentPut("complaintPro", complaintPro)
-                .fluentPut("reviewPro", reviewPro)
+                .fluentPut("talkPro", talkPro)
                 .fluentPut("auditPro", auditPro);
         return overview;
     }
@@ -132,7 +132,6 @@ public class DataGobalService {
 
     /**
      * 获取突出问题排名
-     *
      * @return
      */
     public List<StrongProblemRank> getStrongProblemRank(Date beginTime, Date endTime) {
@@ -144,31 +143,7 @@ public class DataGobalService {
         return res;
     }
 
-    public List<CommonVo> getSuperviseProTotal(Date beginTime, Date endTime) {
-        List<CommonVo> res = negativeProblemRelationMapper.selectSuperviseProTotal(beginTime, endTime);
-        return res;
-    }
 
-    public List<CommonVo> getCaseVerifyProTotal(Date beginTime, Date endTime) {
-        List<CommonVo> res = negativeProblemRelationMapper.selectCaseVerifyProTotal(beginTime, endTime);
-        return res;
-    }
-
-    public List<CommonVo> getMailProTotal(Date beginTime, Date endTime) {
-        List<CommonVo> res = negativeProblemRelationMapper.selectMailProTotal(beginTime, endTime);
-        return res;
-    }
-
-    public List<CommonVo> getPoliceProTotal(Date beginTime, Date endTime) {
-        List<CommonVo> res = negativeProblemRelationMapper.selectPoliceProTotal(beginTime, endTime);
-        return res;
-    }
-
-
-    public List<CommonVo> getReviewProTotal(Date beginTime, Date endTime) {
-        List<CommonVo> res = negativeProblemRelationMapper.selectReviewProTotal(beginTime, endTime);
-        return res;
-    }
 
     public List<GobalMapIconVo> getMapIconInfo(Date beginTime, Date endTime) {
         List<GobalMapIconVo> res = new ArrayList<>();

src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java

@@ -134,6 +134,7 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
 
 
 
+
         return null;
     }
 }