Tenlion/btxtgxq-system-bigdata
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Tenlion:0501424138ff7c06386a3dd85fae18c945fe0f76
Branches Tags
Tenlion:main
..
compare: Tenlion:0368be415f7423e70fada78cb7af7576182e9959
Branches Tags
Tenlion:main

No commits in common. "0501424138ff7c06386a3dd85fae18c945fe0f76" and "0368be415f7423e70fada78cb7af7576182e9959" have entirely different histories.
0501424138 ... 0368be415f

9 changed files with 40 additions and 74 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

6
src/main/resources/application.yml
View File

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

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

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

3
src/main/resources/mybatis/mapper/kpi/kpi-mapper.xml
View File

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