From 26feab00d81f0eccf32e019a02ffd322ff36f549 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 20 Dec 2019 09:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 14 ++-- .../epdc/constant/KpiRuleCodeConstant.java | 37 +++++++++ ...{KpiDataEnum.java => KpiMetaDataEnum.java} | 4 +- .../elink/esua/epdc/enums/kpiDataEnum.java | 76 ------------------- .../service/impl/KpiMetaDataServiceImpl.java | 10 +-- 5 files changed, 51 insertions(+), 90 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiRuleCodeConstant.java rename esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/{KpiDataEnum.java => KpiMetaDataEnum.java} (95%) delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/kpiDataEnum.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index dc65b83fc..3a311a0dc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -51,7 +51,7 @@ import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; -import com.elink.esua.epdc.enums.KpiDataEnum; +import com.elink.esua.epdc.enums.KpiMetaDataEnum; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.events.service.ImgService; @@ -822,24 +822,24 @@ public class ItemServiceImpl extends BaseServiceImpl implem kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.ZERO_STR); List yawpList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto); for (KpiMetaDataDTO item : yawpList) { - item.setDataCode(KpiDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getValue()); - item.setDataName(KpiDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getName()); + item.setDataCode(KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getValue()); + item.setDataName(KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getName()); } kpiMetaDataDTOList.addAll(yawpList); //1-基本满意 kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.ONE_STR); List betterList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto); for (KpiMetaDataDTO item : betterList) { - item.setDataCode(KpiDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getValue()); - item.setDataName(KpiDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getName()); + item.setDataCode(KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getValue()); + item.setDataName(KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getName()); } kpiMetaDataDTOList.addAll(betterList); //2-非常满意 kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.TWO_STR); List bestList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto); for (KpiMetaDataDTO item : bestList) { - item.setDataCode(KpiDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getValue()); - item.setDataName(KpiDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getName()); + item.setDataCode(KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getValue()); + item.setDataName(KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getName()); } kpiMetaDataDTOList.addAll(bestList); return new Result>().ok(kpiMetaDataDTOList); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiRuleCodeConstant.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiRuleCodeConstant.java new file mode 100644 index 000000000..c2cda7575 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiRuleCodeConstant.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.constant; + +/** + * 考核规则编码常量 + * + * @author work@yujt.net.cn + * @date 2019/12/19 14:45 + */ +public class KpiRuleCodeConstant { + + /** + * 公式计算：基础网格平时工作成效、月度 + */ + String GRID_WORK_SCORE_MONTH = "calcGridWorkScoreByMonth"; + /** + * 公式计算：基础网格平时工作成效、季度 + */ + String GRID_WORK_SCORE_QUARTER = "calcGridWorkScoreByQuarter"; + /** + * 公式计算：基础网格平时工作成效、年度 + */ + String GRID_WORK_SCORE_YEAR = "calcGridWorkScoreByYear"; + + + /** + * 公式计算：基础网格绩效考核结果、月度 + */ + String GRID_KPI_RESULT_MONTH = "calcGridKpiResultByMonth"; + /** + * 公式计算：基础网格绩效考核结果、季度 + */ + String GRID_KPI_RESULT_QUARTER = "calcGridKpiResultByQuarter"; + /** + * 公式计算：基础网格绩效考核结果、年度 + */ + String GRID_KPI_RESULT_YEAR = "calcGridKpiResultByYear"; +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java similarity index 95% rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiDataEnum.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java index 0b91f7630..150e9ae93 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiDataEnum.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java @@ -5,7 +5,7 @@ package com.elink.esua.epdc.enums; * @Date: 2019/12/17 19:53 * @Description: 数据项名称 */ -public enum KpiDataEnum { +public enum KpiMetaDataEnum { /*** * 群众反映问题总数 @@ -53,7 +53,7 @@ public enum KpiDataEnum { private String name; - KpiDataEnum(String value, String name) { + KpiMetaDataEnum(String value, String name) { this.value = value; this.name = name; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/kpiDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/kpiDataEnum.java deleted file mode 100644 index 0b91f7630..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/kpiDataEnum.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.elink.esua.epdc.enums; - -/** - * @author: qushutong - * @Date: 2019/12/17 19:53 - * @Description: 数据项名称 - */ -public enum KpiDataEnum { - - /*** - * 群众反映问题总数 - */ - PEOPLE_REPORT_AMOUNT("people_report_amount", "群众反映问题总数"), - - /*** - * 群众反映问题响应数 - */ - PEOPLE_REPORT_RESP_AMOUNT("people_report_resp_amount","群众反映问题响应数"), - - /*** - * 居民对项目处理评为“满意”的评价数量 - */ - PEOPLE_HIGH_EVALUATION_AMOUNT("people_high_evaluation_amount","问题办理满意数"), - - /*** - * 居民对项目处理评为“基本满意”的评价数量 - */ - PEOPLE_MEDIUM_EVALUATION_AMOUNT("people_medium_evaluation_amount","问题办理基本满意数"), - - /*** - * 居民对项目处理评为“不满意”的评价数量 - */ - PEOPLE_LOW_EVALUATION_AMOUNT("people_low_evaluation_amount","问题办理不满意数"), - - /*** - * 上级部门响应网格呼叫总数 - */ - GRID_CALL_SUPERIOR_RESP_AMOUNT("grid_call_superior_resp_amount","响应网格呼叫数"), - - - /*** - * 网格呼叫上级部门总数 - */ - GRID_CALL_SUPERIOR_AMOUNT("grid_call_superior_amount","网格呼叫总数"), - - - /*** - * 上级部门关闭网格呼叫总数 - */ - GRID_CALL_SUPERIOR_CLOSE_AMOUNT("grid_call_superior_close_amount","办结呼叫事项数"); - - private String value; - - private String name; - - KpiDataEnum(String value, String name) { - this.value = value; - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index 762cbc6e8..2530c5326 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java @@ -37,7 +37,7 @@ import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO; import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.entity.KpiMetaDataEntity; import com.elink.esua.epdc.enums.KpiCycleEnum; -import com.elink.esua.epdc.enums.kpiDataEnum; +import com.elink.esua.epdc.enums.KpiMetaDataEnum; import com.elink.esua.epdc.feign.EventFeignClient; import com.elink.esua.epdc.service.KpiMetaDataService; import com.elink.esua.epdc.utils.DeptUtils; @@ -233,8 +233,8 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl