重点项目概括 接口修改

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<Long> gridIds;
+    List<Long> deptIdList;
 }

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
 
     /**
      * 未解决项目数

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<ItemAnalysisResultDTO> data = itemAnalysisService.getItemAnalysis(formDto);
         return new Result<List<ItemAnalysisResultDTO>>().ok(data);
     }
+
+    /**
+     * @Description: 重点项目概况
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+     * @Author: zy
+     * @Date: 2020-02-11
+     */
+    @GetMapping("getItemSurvey")
+    public Result<ItemSurveyResultDTO> getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) {
+        ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO);
+        return new Result<ItemSurveyResultDTO>().ok(data);
+    }
 }

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<ReportSolvedItemResultDTO> page = itemAnalysisService.listReportSolvedItemResultDTO(params);
 		return new Result<PageData<ReportSolvedItemResultDTO>>().ok(page);
 	}
-	/**
-	 * @Description: 重点项目概况
-	 * @Param: [formDto]
-	 * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
-	 * @Author: zy
-	 * @Date: 2020-02-11
-	 */
-	@GetMapping("getItemSurvey")
-	public Result<ItemSurveyResultDTO> getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) {
-		ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO);
-		return new Result<ItemSurveyResultDTO>().ok(data);
-	}
 }

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'
-        <if test="gridIds!=null and gridIds.size()>0">
-            and eid.DEPT_ID in
-            <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
+        AND ei.GRID_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+        <if test="timestamp != null and timestamp != ''">
+            <![CDATA[ AND DATE_FORMAT(ei.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         ) 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'
-        <if test="gridIds!=null and gridIds.size()>0">
-            and eid.DEPT_ID in
-            <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
+        eigp.DEL_FLAG = '0'
+        AND ei.GRID_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+        <if test="timestamp != null and timestamp != ''">
+            <![CDATA[ AND DATE_FORMAT(eigp.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         ) t2;
     </select>

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<ItemSurveyResultDTO> getItemSurvey(@RequestBody ItemSurveyFormDTO formDto) {
         //效验数据
         ValidatorUtils.validateEntity(formDto);
-        formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
+        formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         return analysisItemService.getItemSurvey(formDto);
     }
 

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<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto);
 
     /**