From bd043b536834a1ff4ccee0ad0371f542b4c9dd15 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 11 Feb 2020 17:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=A1=B9=E7=9B=AE=E6=A6=82?= =?UTF-8?q?=E6=8B=AC=20=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/item/form/ItemSurveyFormDTO.java | 2 +- .../dto/item/result/ItemSurveyResultDTO.java | 4 -- .../controller/AppItemAnalysisController.java | 15 +++++++ .../controller/ItemAnalysisController.java | 12 ------ .../resources/mapper/item/ItemAnalysisDao.xml | 39 +++++++++---------- .../controller/ApiAnalysisItemController.java | 2 +- .../epdc/feign/AnalysisItemFeignClient.java | 2 +- 7 files changed, 37 insertions(+), 39 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java index b18f9d466..81a77b49b 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java @@ -29,5 +29,5 @@ public class ItemSurveyFormDTO implements Serializable { /** * 部门ID列表 */ - List gridIds; + List deptIdList; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java index acf669b3e..661cf8206 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java @@ -11,10 +11,6 @@ import java.io.Serializable; */ @Data public class ItemSurveyResultDTO implements Serializable { -// t1.unsolvedCount, -- notCloseNum -// t2.dispatchCount, -- reportGridPlatformNum -// t2.solvingCount, -- solvingNum -// t2.solvedCount -- solvedNum /** * 未解决项目数 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java index 1f1cde52f..d488fea78 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java @@ -2,7 +2,9 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,4 +39,17 @@ public class AppItemAnalysisController { List data = itemAnalysisService.getItemAnalysis(formDto); return new Result>().ok(data); } + + /** + * @Description: 重点项目概况 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getItemSurvey") + public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) { + ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO); + return new Result().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java index 57a79aeec..f7fa875ec 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java @@ -109,16 +109,4 @@ public class ItemAnalysisController { PageData page = itemAnalysisService.listReportSolvedItemResultDTO(params); return new Result>().ok(page); } - /** - * @Description: 重点项目概况 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping("getItemSurvey") - public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) { - ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO); - return new Result().ok(data); - } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml index 15354bdc5..833455312 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml @@ -346,41 +346,40 @@ COUNT( ei.ID ) AS unsolvedCount FROM esua_epdc_events.epdc_item ei - LEFT JOIN esua_epdc_events.epdc_item_dept eid ON eid.ITEM_ID = ei.ID - AND eid.DEL_FLAG = '0' WHERE ei.ITEM_STATE = 0 AND ei.DEL_FLAG = '0' - - and eid.DEPT_ID in - - #{deptId} - + AND ei.GRID_ID IN + + #{deptId} + + + #{timestamp} ) t1, ( SELECT - COUNT( DISTINCT eihp.ITEM_ID ) AS dispatchCount, + COUNT( DISTINCT eigp.REFERENCE_ID ) AS dispatchCount, COUNT( DISTINCT ei1.ID ) AS solvingCount, COUNT( DISTINCT ei2.ID ) AS solvedCount FROM - esua_epdc_events.epdc_item_handle_process eihp - LEFT JOIN esua_epdc_events.epdc_item ei1 ON eihp.ITEM_ID = ei1.ID + esua_epdc_events.epdc_item_grid_platform eigp + LEFT JOIN esua_epdc_events.epdc_item ei ON eigp.REFERENCE_ID = ei.ID + AND ei.DEL_FLAG = '0' + LEFT JOIN esua_epdc_events.epdc_item ei1 ON eigp.REFERENCE_ID = ei1.ID AND ei1.DEL_FLAG = 0 AND ei1.ITEM_STATE = 0 - LEFT JOIN esua_epdc_events.epdc_item ei2 ON eihp.ITEM_ID = ei2.ID + LEFT JOIN esua_epdc_events.epdc_item ei2 ON eigp.REFERENCE_ID = ei2.ID AND ei2.DEL_FLAG = 0 AND ( ei2.ITEM_STATE = 5 OR ei2.ITEM_STATE = 10 ) - LEFT JOIN esua_epdc_events.epdc_item_dept eid ON eid.ITEM_ID = eihp.ITEM_ID - AND eid.DEL_FLAG = '0' WHERE - eihp.STATE = 15 - AND eihp.DEL_FLAG = '0' - - and eid.DEPT_ID in - - #{deptId} - + eigp.DEL_FLAG = '0' + AND ei.GRID_ID IN + + #{deptId} + + + #{timestamp} ) t2; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java index 13c0523f8..317ebb4a9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java @@ -55,7 +55,7 @@ public class ApiAnalysisItemController { public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDto) { //效验数据 ValidatorUtils.validateEntity(formDto); - formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); + formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return analysisItemService.getItemSurvey(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java index 262cc78b8..bdefc29f7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java @@ -40,7 +40,7 @@ public interface AnalysisItemFeignClient { * @Author: zy * @Date: 2020-02-11 */ - @GetMapping(value = "analysis/item/getItemSurvey") + @GetMapping(value = "analysis/appitem/getItemSurvey") Result getItemSurvey(ItemSurveyFormDTO formDto); /**