diff --git a/src/main/java/com/cm/bigdata/pojo/pos/kpi/ReportCasePO.java b/src/main/java/com/cm/bigdata/pojo/pos/kpi/ReportCasePO.java index 8a745a1..7a5d3ce 100644 --- a/src/main/java/com/cm/bigdata/pojo/pos/kpi/ReportCasePO.java +++ b/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; } diff --git a/src/main/java/com/cm/bigdata/service/kpi/impl/KpiServiceImpl.java b/src/main/java/com/cm/bigdata/service/kpi/impl/KpiServiceImpl.java index 643866a..70a8a11 100644 --- a/src/main/java/com/cm/bigdata/service/kpi/impl/KpiServiceImpl.java +++ b/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()); diff --git a/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgyEGIKRTRunnable.java b/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgyEGIKRTRunnable.java index 91163dc..d649bdf 100644 --- a/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgyEGIKRTRunnable.java +++ b/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 userIds, List> shouldReportDayWeeks, List> unShouldReportDayWeeks, List 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); + } + } diff --git a/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgzCDEFGHRunnable.java b/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgzCDEFGHRunnable.java index fd4d7d1..afbf5f1 100644 --- a/src/main/java/com/cm/bigdata/service/kpi/task/sub/KpiKhxzWgzCDEFGHRunnable.java +++ b/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 communityBossMap = new HashMap<>(); + if(kpiKhxzWgzDTO.getUserId().equals("ca546a0a-52a4-48f4-a1c3-26f4505894f1")) { + System.out.println(); + } communityBossMap.put("communityBossParentUserId", kpiKhxzWgzDTO.getUserId()); // 4及网格员 List communityBossPOS = communityBossService.listPO(communityBossMap); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9a2a4a8..e9f62c2 100644 --- a/src/main/resources/application.yml +++ b/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 - org.mybatis: error - com.cm: error + root: debug + org.mybatis: debug + com.cm: debug # 访问其他项目 server-other: diff --git a/src/main/resources/mybatis/db2-mapper/kpi/report-case-mapper.xml b/src/main/resources/mybatis/db2-mapper/kpi/report-case-mapper.xml index 2d8a819..6f8c82d 100644 --- a/src/main/resources/mybatis/db2-mapper/kpi/report-case-mapper.xml +++ b/src/main/resources/mybatis/db2-mapper/kpi/report-case-mapper.xml @@ -10,6 +10,7 @@ + @@ -112,6 +113,7 @@ case_type_name, is_self, grade, + case_reporter, gmt_create, creator, gmt_modified, diff --git a/src/main/resources/mybatis/mapper/kpi/kpi-mapper.xml b/src/main/resources/mybatis/mapper/kpi/kpi-mapper.xml index f0082f7..ee3d707 100644 --- a/src/main/resources/mybatis/mapper/kpi/kpi-mapper.xml +++ b/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},