修改枚举类名

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<ItemDao, ItemEntity> implem
         kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.ZERO_STR);
         List<KpiMetaDataDTO> yawpList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto);
         for (KpiMetaDataDTO item : yawpList) {
-            item.setDataCode(KpiDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getValue());
+            item.setDataCode(KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getValue());
-            item.setDataName(KpiDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getName());
+            item.setDataName(KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getName());
         }
         kpiMetaDataDTOList.addAll(yawpList);
         //1-基本满意
         kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.ONE_STR);
         List<KpiMetaDataDTO> betterList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto);
         for (KpiMetaDataDTO item : betterList) {
-            item.setDataCode(KpiDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getValue());
+            item.setDataCode(KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getValue());
-            item.setDataName(KpiDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getName());
+            item.setDataName(KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getName());
         }
         kpiMetaDataDTOList.addAll(betterList);
         //2-非常满意
         kpiEventEvaluationFromDto.setEvaluationScore(NumConstant.TWO_STR);
         List<KpiMetaDataDTO> bestList = baseDao.selectListKpiEvaluationData(kpiEventEvaluationFromDto);
         for (KpiMetaDataDTO item : bestList) {
-            item.setDataCode(KpiDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getValue());
+            item.setDataCode(KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getValue());
-            item.setDataName(KpiDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getName());
+            item.setDataName(KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getName());
         }
         kpiMetaDataDTOList.addAll(bestList);
         return new Result<List<KpiMetaDataDTO>>().ok(kpiMetaDataDTOList);

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";
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiDataEnum.java → 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;
     }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/kpiDataEnum.java

@@ -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;
-    }
-}

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<KpiMetaDataDao, KpiM
         KpiMetaDataEntity respondAmountEntity;
         for (KpiEventReportAmountResultDTO reportAmount : eventReportAmountList) {
             reportAmountEntity = new KpiMetaDataEntity();
-            reportAmountEntity.setDataCode(kpiDataEnum.PEOPLE_REPORT_AMOUNT.getValue());
+            reportAmountEntity.setDataCode(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getValue());
-            reportAmountEntity.setDataName(kpiDataEnum.PEOPLE_REPORT_AMOUNT.getName());
+            reportAmountEntity.setDataName(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getName());
             reportAmountEntity.setDataValue(BigDecimal.valueOf(reportAmount.getReportAmount()));
             reportAmountEntity.setDeptId(reportAmount.getGridId());
             reportAmountEntity.setKpiCycle(kpiCycle);
@@ -242,8 +242,8 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
             reportAmountEntity.setEndDate(endDate);
 
             respondAmountEntity = new KpiMetaDataEntity();
-            respondAmountEntity.setDataCode(kpiDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getValue());
+            respondAmountEntity.setDataCode(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getValue());
-            respondAmountEntity.setDataName(kpiDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getName());
+            respondAmountEntity.setDataName(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getName());
             respondAmountEntity.setDataValue(BigDecimal.valueOf(reportAmount.getRespondAmount()));
             respondAmountEntity.setDeptId(reportAmount.getGridId());
             respondAmountEntity.setKpiCycle(kpiCycle);