修改代码

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java

@@ -100,10 +100,10 @@ public class KpiMetaDataController {
      */
     @GetMapping("buildMetaData")
     public Result buildMetaData(){
-        //网格事件上报总数 与响应数
-//        kpiMetaDataService.createMataData();
-        //问题办理满意度
-        kpiMetaDataService.createEvaluationData();
+        // 统计网格内 群众事件上报总数 与 被响应总数
+//        kpiMetaDataService.statPeopleReportAmount();
+        // 统计网格内 群众对网格问题办理 满意度评价
+//        kpiMetaDataService.statPeopleEvaluation();
         //网格呼叫事项总数 与响应呼叫数（议题流转项目）
         kpiMetaDataService.createItemMataData();
         return new Result();

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java

@@ -94,22 +94,22 @@ public interface KpiMetaDataService extends BaseService<KpiMetaDataEntity> {
     void delete(String[] ids);
 
     /***
-     * 构建元素数据 网格事件上报总数 与响应数
+     * 统计网格内 群众事件上报总数 与 被响应总数，存入元数据表
      * @param
      * @return void
      * @author qushutong
      * @date 2019/12/16 10:19
      */
-    void createMataData();
+    void statPeopleReportAmount();
 
     /***
-     * 构建元素数据 问题办理满意度
+     * 统计网格内 群众对网格问题办理 满意度评价，存入元数据表
      * @param
      * @return void
      * @author qushutong
      * @date 2019/12/18 9:34
      */
-    void createEvaluationData();
+    void statPeopleEvaluation();
 
 
     /***

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

@@ -123,7 +123,7 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
     }
 
     @Override
-    public void createMataData() {
+    public void statPeopleReportAmount() {
         statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
         statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
         statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
@@ -247,7 +247,17 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
         return kpiMetaDataEntityList;
     }
 
-    private List<KpiMetaDataEntity> packageMetaDataOfEvaluationList(List<KpiEvaluationAmountResultDTO> peopleEvaluationDataList,
+    /**
+     * 根据统计的居民满意度情况，组装元数据实体集合
+     *
+     * @param peopleEvaluationDataList
+     * @param eventReportAmountFormDto
+     * @param kpiCycle
+     * @return java.util.List<com.elink.esua.epdc.entity.KpiMetaDataEntity>
+     * @author work@yujt.net.cn
+     * @date 2019/12/20 15:55
+     */
+    private List<KpiMetaDataEntity> packageMetaDataByEvaluationList(List<KpiEvaluationAmountResultDTO> peopleEvaluationDataList,
                                                                     KpiMetaDataOfEventsFormDTO eventReportAmountFormDto, String kpiCycle) {
         Date startDate = eventReportAmountFormDto.getStartDate();
         Date endDate = eventReportAmountFormDto.getEndDate();
@@ -300,12 +310,20 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
     }
 
     @Override
-    public void createEvaluationData() {
+    public void statPeopleEvaluation() {
         statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
         statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
         statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
     }
 
+    /**
+     * 根据考核周期，统计周期内群众对网格处理项目的满意率
+     *
+     * @param kpiCycle
+     * @return void
+     * @author work@yujt.net.cn
+     * @date 2019/12/20 15:53
+     */
     private void statMetaDataOfPeopleEvaluation(String kpiCycle) {
         // 获取考核周期开始日
         Date startDate = getKpiStartDateByCycle(kpiCycle);
@@ -317,14 +335,13 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
         metaDataFormDto.setStartDate(startDate);
         metaDataFormDto.setEndDate(LocalDateUtils.localDateToDate(YearMonth.now().minusMonths(NumConstant.ONE).atEndOfMonth()));
 
-        // 初始化 页容量 页码
         int pageSize = NumConstant.TEN;
         int pageIndex = NumConstant.ONE;
         List<Long> gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex);
         do {
             metaDataFormDto.setGridIdList(gridList);
             List<KpiEvaluationAmountResultDTO> peopleEvaluationDataList = this.getMetaDataListOfPeopleEvaluation(metaDataFormDto);
-            List<KpiMetaDataEntity> kpiMetaDataEntities = this.packageMetaDataOfEvaluationList(peopleEvaluationDataList, metaDataFormDto, kpiCycle);
+            List<KpiMetaDataEntity> kpiMetaDataEntities = this.packageMetaDataByEvaluationList(peopleEvaluationDataList, metaDataFormDto, kpiCycle);
             // 插入之前删除已存在
             this.deleteRepetitionMetaList(kpiMetaDataEntities);
             // 插入数据库