Merge branch 'main' of e.coding.net:tsteam/bt-xtgxq-wghzlpt/system-bigdata

src/main/java/com/cm/bigdata/pojo/dtos/kpi/KpiKhxzWgyDTO.java

@@ -86,46 +86,50 @@ public class KpiKhxzWgyDTO implements Serializable {
     @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月单个案件分值"}, index = 5)
     @JsonProperty("F")
     private Double f;
+
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "特殊案件数量"}, index = 6)
+    @JsonProperty("complex")
+    private Integer complex;
     /**
      * 实报案件数量
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月实报案件", "数量"}, index = 6)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月实报案件", "数量"}, index = 7)
     @JsonProperty("G")
     private Integer g;
     /**
      * 实报案件得分
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月实报案件", "得分"}, index = 7)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月实报案件", "得分"}, index = 8)
     @JsonProperty("H")
     private Double h;
     /**
      * 少报案件数量
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月少报案件", "数量"}, index = 8)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月少报案件", "数量"}, index = 9)
     @JsonProperty("I")
     private Integer i;
     /**
      * 少报案件得分
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月少报案件", "得分"}, index = 9)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月少报案件", "得分"}, index = 10)
     @JsonProperty("J")
     private Double j;
     /**
      * 多报案件数量
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月多报案件", "数量"}, index = 10)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月多报案件", "数量"}, index = 11)
     @JsonProperty("K")
     private Integer k;
     /**
      * 多报案件得分
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月多报案件", "得分"}, index = 11)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "本月多报案件", "得分"}, index = 12)
     @JsonProperty("L")
     private Double l;
     /**
      * 应上报却未上报案件
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "应上报却未上报案件"}, index = 12)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "应上报却未上报案件"}, index = 13)
     @JsonProperty("M")
     private Integer m;
     /**
@@ -136,7 +140,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 平台立案上报不标准不及时的
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "平台立案上报不标准不及时的"}, index = 13)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "平台立案上报不标准不及时的"}, index = 14)
     @JsonProperty("N")
     private Integer n;
     /**
@@ -147,7 +151,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 恶意退单
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "恶意退单"}, index = 14)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "恶意退单"}, index = 15)
     @JsonProperty("O")
     private Integer o;
     /**
@@ -158,7 +162,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 扣分其它情况
      */
-    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "其它情况"}, index = 15)
+    @ExcelProperty(value = {"巡查上报、案件受理过程质量", "凡属下列情况之一经核准予以扣分", "其它情况"}, index = 16)
     @JsonProperty("P")
     private Integer p;
     /**
@@ -169,13 +173,13 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 结案情况得分
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "结案情况得分"}, index = 16)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "结案情况得分"}, index = 17)
     @JsonProperty("Q")
     private Double q;
     /**
      * 督查次数
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "督察案件结案情况", "督查次数"}, index = 17)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "督察案件结案情况", "督查次数"}, index = 18)
     @JsonProperty("R")
     private Integer r;
     /**
@@ -186,19 +190,19 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 督查扣分
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "督察案件结案情况", "督查扣分"}, index = 18)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "督察案件结案情况", "督查扣分"}, index = 19)
     @JsonProperty("S")
     private Double s;
     /**
      * 网格员24小时未核查扣分
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "网格员24小时未核查扣分"}, index = 19)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "网格员24小时未核查扣分"}, index = 20)
     @JsonProperty("T")
     private Double t;
     /**
      * 反馈虚假信息
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "反馈虚假信息"}, index = 20)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "反馈虚假信息"}, index = 21)
     @JsonProperty("U")
     private Double u;
     /**
@@ -209,7 +213,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 其他情况
      */
-    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "其他情况"}, index = 21)
+    @ExcelProperty(value = {"案件处置实效（指挥协调实效）", "案件处置过程质量", "其他情况"}, index = 22)
     @JsonProperty("V")
     private Double v;
     /**
@@ -217,18 +221,18 @@ public class KpiKhxzWgyDTO implements Serializable {
      */
     @ExcelIgnore
     private String reasonV;
-    @ExcelProperty(value = {"人口信息管理", "社区基数人口数"}, index = 22)
+    @ExcelProperty(value = {"人口信息管理", "社区基数人口数"}, index = 23)
     private Integer communityBasePopulationCount;
-    @ExcelProperty(value = {"人口信息管理", "社区录入人口数"}, index = 23)
+    @ExcelProperty(value = {"人口信息管理", "社区录入人口数"}, index = 24)
     private Integer communityPopulationCount;
-    @ExcelProperty(value = {"人口信息管理", "社区人口录入比例"}, index = 24)
+    @ExcelProperty(value = {"人口信息管理", "社区人口录入比例"}, index = 25)
     private Double communityPopulationRate;
     @ExcelIgnore
     private Integer populationCount;
     /**
      * 人口信息录入
      */
-    @ExcelProperty(value = {"人口信息管理", "人口信息录入"}, index = 25)
+    @ExcelProperty(value = {"人口信息管理", "人口信息录入(15)"}, index = 26)
     @JsonProperty("W")
     private Double w;
     /**
@@ -239,7 +243,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 人口信息质量管理
      */
-    @ExcelProperty(value = {"人口信息管理", "人口信息质量管理"}, index = 26)
+    @ExcelProperty(value = {"人口信息管理", "人口信息质量管理(15)"}, index = 27)
     @JsonProperty("X")
     private Double x;
     /**
@@ -250,7 +254,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 人口信息维护
      */
-    @ExcelProperty(value = {"人口信息管理", "人口信息维护"}, index = 27)
+    @ExcelProperty(value = {"人口信息管理", "人口信息维护"}, index = 28)
     @JsonProperty("Y")
     private Double y;
     /**
@@ -261,7 +265,7 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 抽查情况
      */
-    @ExcelProperty(value = {"人口信息管理", "抽查情况"}, index = 28)
+    @ExcelProperty(value = {"人口信息管理", "抽查情况"}, index = 29)
     @JsonProperty("Z")
     private Double z;
     /**
@@ -272,7 +276,8 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 党建信息上报
      */
-    @ExcelProperty(value = {"党组织建设", "党建信息上报"}, index = 29)
+    // @ExcelProperty(value = {"党组织建设", "党建信息上报"}, index = 29)
+    @ExcelIgnore
     @JsonProperty("AA")
     private Double aA;
     /**
@@ -283,7 +288,8 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 党建信息质量管理
      */
-    @ExcelProperty(value = {"党组织建设", "党建信息质量管理"}, index = 30)
+    // @ExcelProperty(value = {"党组织建设", "党建信息质量管理"}, index = 30)
+    @ExcelIgnore
     @JsonProperty("AB")
     private Double aB;
     /**
@@ -294,7 +300,8 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 党建信息维护
      */
-    @ExcelProperty(value = {"党组织建设", "党建信息维护"}, index = 31)
+    // @ExcelProperty(value = {"党组织建设", "党建信息维护"}, index = 31)
+    @ExcelIgnore
     @JsonProperty("AC")
     private Double aC;
     /**
@@ -305,7 +312,8 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 抽查情况
      */
-    @ExcelProperty(value = {"党组织建设", "抽查情况"}, index = 32)
+    // @ExcelProperty(value = {"党组织建设", "抽查情况"}, index = 32)
+    @ExcelIgnore
     @JsonProperty("AD")
     private Double aD;
     /**
@@ -316,31 +324,27 @@ public class KpiKhxzWgyDTO implements Serializable {
     /**
      * 总得分
      */
-    @ExcelProperty(value = {"总得分"}, index = 33)
+    @ExcelProperty(value = {"总得分"}, index = 30)
     @JsonProperty("AE")
     private Double aE;
     /**
      * 应发绩效工资
      */
-    @ExcelProperty(value = {"应发(浮动)绩效工资"}, index = 34)
+    @ExcelProperty(value = {"应发(浮动)绩效工资"}, index = 31)
     @JsonProperty("AF")
     private String aF;
     /**
      * 实发绩效工资
      */
-    @ExcelProperty(value = {"实发绩效工资"}, index = 35)
+    @ExcelProperty(value = {"实发绩效工资"}, index = 32)
     @JsonProperty("AG")
     private Double aG;
     /**
      * 评价
      */
-    @ExcelProperty(value = {"评价"}, index = 36)
+    @ExcelProperty(value = {"评价"}, index = 33)
     @JsonProperty("AH")
     private String aH;
-
-    @ExcelProperty(value = {"特殊案件数量"}, index = 37)
-    @JsonProperty("complex")
-    private Integer complex;
     /**
      * 修改时间
      */

src/main/java/com/cm/bigdata/pojo/pos/kpi/ReportCasePO.java

@@ -9,6 +9,7 @@ public class ReportCasePO {
     private String communityName;
     private String caseTypeId;
     private String caseTypeName;
+    private String caseReporter;
     private String isSelf;
     private Double grade;
     private String gmtCreate;
@@ -75,6 +76,14 @@ public class ReportCasePO {
         this.caseTypeName = caseTypeName;
     }
 
+    public String getCaseReporter() {
+        return caseReporter;
+    }
+
+    public void setCaseReporter(String caseReporter) {
+        this.caseReporter = caseReporter;
+    }
+
     public String getIsSelf() {
         return isSelf;
     }

src/main/java/com/cm/bigdata/service/kpi/impl/KpiServiceImpl.java

@@ -446,6 +446,7 @@ public class KpiServiceImpl implements IKpiService {
             params.put("isSelf", reportCasePO.getIsSelf());
             params.put("gmtReport", reportCasePO.getGmtCreate());
             params.put("reportUserId", reportCasePO.getCreator());
+            params.put("reportUserName", reportCasePO.getCaseReporter());
             params.put("inspectScore", reportCasePO.getGrade());
             params.put("isDelete", reportCasePO.getIsDelete());
             params.put("caseStatus", reportCasePO.getCaseStatus());

src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgyEGIKRTRunnable.java

@@ -208,6 +208,9 @@ public class KpiKhxzWgyEGIKRTRunnable implements Runnable {
     private void updateEGIKRTNew(List<String> userIds, List<List<KpiUtil.DayWeek>> shouldReportDayWeeks, List<List<KpiUtil.DayWeek>> unShouldReportDayWeeks, List<HolidayPO> holidayPOS) {
         userIds.forEach(userId -> {
             try {
+                if(userId.equals("b539fe53-e335-4832-b27c-d1b69c1bd25c") || userId.equals("ca546a0a-52a4-48f4-a1c3-26f4505894f1")) {
+                    System.out.println();
+                }
                 int shouldCount = shouldReportDayWeeks.size();
                 // 网格数量
                 Integer gridCount = userGridService.countUserGrid(userId);
@@ -339,4 +342,12 @@ public class KpiKhxzWgyEGIKRTRunnable implements Runnable {
         return kpiHolidayDao.list(params);
     }
 
+    public static void main(String[] args) {
+        int lackCount = 0;
+        int gridCount = 0;
+        int realityCount = 100;
+        lackCount += Math.max(gridCount - realityCount, 0);
+        System.out.println(lackCount);
+    }
+
 }

src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgzCDEFGHRunnable.java

@@ -37,6 +37,9 @@ public class KpiKhxzWgzCDEFGHRunnable implements Runnable {
     public void run() {
         kpiKhxzWgzDTOS.forEach(kpiKhxzWgzDTO -> {
             Map<String, Object> communityBossMap = new HashMap<>();
+            if(kpiKhxzWgzDTO.getUserId().equals("ca546a0a-52a4-48f4-a1c3-26f4505894f1")) {
+                System.out.println();
+            }
             communityBossMap.put("communityBossParentUserId", kpiKhxzWgzDTO.getUserId());
             // 4及网格员
             List<CommunityBossPO> communityBossPOS = communityBossService.listPO(communityBossMap);

src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzZnbmCDEFGLMRunnable.java

@@ -54,11 +54,12 @@ public class KpiKhxzZnbmCDEFGLMRunnable implements Runnable {
             updateParams.put("C", handleCount);
             updateParams.put("D", inspectCount);
             updateParams.put("E", unInspectCount);
-            // 这里劳动监察大队是50，其余的部门是200
+            // 这里劳动监察大队是50，其余的部门是200（旧版本）
+            // 所有部门都改为50（新版本-renpc-20240508）
             if (ldjcddUserIds.contains(userId)) {
                 updateParams.put("F", inspectCount * 50D);
             } else {
-                updateParams.put("F", inspectCount * 200D);
+                updateParams.put("F", inspectCount * 50D);
             }
             double G = handleCount == 0 ? 0 : 60D / handleCount * inspectCount;
             updateParams.put("G", G);

src/main/resources/application.yml

@@ -138,9 +138,9 @@ access-control:
 logging:
   file: E:\Users\TS-QD1\Desktop\UploadFiles\logs\bigdata\logs.log
   level:
-    root: error
+    root: debug
-    org.mybatis: error
+    org.mybatis: debug
-    com.cm: error
+    com.cm: debug
 
 # 访问其他项目
 server-other:

src/main/resources/mybatis/db2-mapper/kpi/report-case-mapper.xml

@@ -10,6 +10,7 @@
         <result column="community_name" property="communityName"/>
         <result column="case_type_id" property="caseTypeId"/>
         <result column="case_type_name" property="caseTypeName"/>
+        <result column="case_reporter" property="caseReporter"/>
         <result column="is_self" property="isSelf"/>
         <result column="grade" property="grade"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -112,6 +113,7 @@
             case_type_name,
             is_self,
             grade,
+            case_reporter,
             gmt_create,
             creator,
             gmt_modified,

src/main/resources/mybatis/mapper/kpi/kpi-mapper.xml

@@ -402,6 +402,7 @@
             is_inspect,
             is_self,
             report_user_id,
+            report_user_name,
             assign_user_id,
             handle_user_id,
             inspect_user_id,
@@ -436,6 +437,7 @@
             #{isInspect},
             #{isSelf},
             #{reportUserId},
+            #{reportUserName},
             #{assignUserId},
             #{handleUserId},
             #{inspectUserId},
@@ -468,6 +470,7 @@
             gmt_inspect = #{gmtInspect},
             is_self = #{isSelf},
             report_user_id = #{reportUserId},
+            report_user_name = #{reportUserName},
             assign_user_id = #{assignUserId},
             handle_user_id = #{handleUserId},
             inspect_user_id = #{inspectUserId},