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 a78bcbab0..c99d06611 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 @@ -870,6 +870,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.LevaluationLevelBest); kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO); allMetaDataList.addAll(kpiMetaDataDTOList); - return null; + return new Result>().ok(allMetaDataList); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 002f04b58..fa0acf159 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -918,21 +918,21 @@ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java index e0af5b4a0..c06973750 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java @@ -105,7 +105,7 @@ public class KpiMetaDataController { // 统计网格内 群众对网格问题办理 满意度评价 // kpiMetaDataService.statPeopleEvaluation(); //网格呼叫事项总数 与响应呼叫数(议题流转项目) - kpiMetaDataService.createItemMataData(); +// kpiMetaDataService.createItemMataData(); //网格工作评议 kpiMetaDataService.createJobEvaluation(); return new Result(); 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 59c966417..4674953b7 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 @@ -523,8 +523,8 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl getjobEvaluationDataModule(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) { Result> listResult = eventFeignClient.queryListJobEvaluation(kpiEventJobEvaluationFromDTO); if (!listResult.success() || null == listResult.getData()) { - log.error("统计事件上报数异常"); - throw new RenException("统计事件上报数异常"); + log.error("统计网格工作评议数异常"); + throw new RenException("统计网格工作评议数异常"); } return listResult.getData(); }