From 971b74b2a0f369c8405043675c01dc25f3dee5e5 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 11 Feb 2020 14:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=91=E9=9A=BE=E9=A1=B9=E7=9B=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/result/DifficultItemResultDTO.java   | 27 ++++++
 .../impl/IssueAnalysisServiceImpl.java        |  6 +-
 .../controller/ItemAnalysisController.java    | 16 ++++
 .../modules/item/dao/ItemAnalysisDao.java     | 10 +++
 .../item/service/ItemAnalysisService.java     | 10 +++
 .../service/impl/ItemAnalysisServiceImpl.java | 29 ++++++-
 .../impl/TopicAnalysisServiceImpl.java        |  4 +-
 .../resources/mapper/item/ItemAnalysisDao.xml | 84 +++++++++++++++++++
 8 files changed, 179 insertions(+), 7 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java
new file mode 100644
index 000000000..a76137bb2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java
@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 疑难项目
+ * @Author yinzuomei
+ * @Date 2020/2/11 13:09
+ */
+@Data
+public class DifficultItemResultDTO implements Serializable {
+	private static final long serialVersionUID = -4125919212689714492L;
+	private String id;
+	private String itemContent;
+	private Date createdTime;
+	private Integer operatNum;
+	private String reportFlag;
+	private Integer deptNum;
+	private String itemState;
+	private Date processedTime;
+	private Integer takeTime;
+	private String allDeptNames;
+	private String evaluationScore;
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
index d2f8867bc..4b4e2fada 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
@@ -41,7 +41,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	public PageData<IssueResultDTO> listHottestIssue(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<IssueResultDTO> page = getPage(params);
@@ -61,7 +61,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	public PageData<IssueResultDTO> listLatestIssue(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<IssueResultDTO> page = getPage(params);
@@ -80,7 +80,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	public PageData<IssueClassifiedStatisticDTO> listIssueClassifiedStatistic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		if (StringUtils.isBlank((String) params.get("categoryLevel"))) {
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 329c9f8b0..35485182e 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
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
@@ -69,4 +70,19 @@ public class ItemAnalysisController {
 		PageData<UnsolvedItemResultDTO> page = itemAnalysisService.listUnsolvedItemResultDTO(params);
 		return new Result<PageData<UnsolvedItemResultDTO>>().ok(page);
 	}
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 疑难项目分析
+	 * @Date 2020/2/11 13:12
+	 **/
+	@GetMapping("pageDifficultItem")
+	public Result<PageData<DifficultItemResultDTO>> pageDifficultItem(@RequestParam Map<String, Object> params) {
+		PageData<DifficultItemResultDTO> page = itemAnalysisService.listDifficultItemResultDTO(params);
+		return new Result<PageData<DifficultItemResultDTO>>().ok(page);
+	}
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
index 22670b394..209a41066 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -49,4 +50,13 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
 	 * @Date 2020/2/10 19:16
 	 **/
 	List<UnsolvedItemResultDTO> selectListUnsolvedItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return java.util.List<com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 疑难项目分析列表查询
+	 * @Date 2020/2/11 13:14
+	 **/
+	List<DifficultItemResultDTO> selectListDifficultItemResultDTO(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
index a4349c3ab..94c17f074 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.modules.item.service;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 
@@ -31,4 +32,13 @@ public interface ItemAnalysisService {
 	 * @Date 2020/2/10 19:11
 	 **/
 	PageData<UnsolvedItemResultDTO> listUnsolvedItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 疑难项目分析
+	 * @Date 2020/2/11 13:13
+	 **/
+	PageData<DifficultItemResultDTO> listDifficultItemResultDTO(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
index 20355e29f..7418e6a89 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
@@ -7,10 +7,13 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
+import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao;
 import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,6 +26,8 @@ import java.util.Map;
  */
 @Service
 public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, ItemResultDTO> implements ItemAnalysisService {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	/**
 	 * @param params
 	 * @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
@@ -35,7 +40,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 	public PageData<ItemResultDTO> listItemResultDTO(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<ItemResultDTO> page = getPage(params);
@@ -55,11 +60,31 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 	public PageData<UnsolvedItemResultDTO> listUnsolvedItemResultDTO(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<UnsolvedItemResultDTO> page = getPage(params);
 		List<UnsolvedItemResultDTO> list = baseDao.selectListUnsolvedItemResultDTO(params);
 		return new PageData<>(list, page.getTotal());
 	}
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 疑难项目分析
+	 * @Date 2020/2/11 13:13
+	 **/
+	@Override
+	public PageData<DifficultItemResultDTO> listDifficultItemResultDTO(Map<String, Object> params) {
+		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>(null, 0);
+		}
+		params.put("deptIdList", userDetail.getDeptIdList());
+		logger.info("!!!!!!!!!!!!!!!!!!orderType=" + params.get("orderType"));
+		IPage<DifficultItemResultDTO> page = getPage(params);
+		List<DifficultItemResultDTO> list = baseDao.selectListDifficultItemResultDTO(params);
+		return new PageData<>(list, page.getTotal());
+	}
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
index f9869a009..4248ecad3 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
@@ -38,7 +38,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	public PageData<TopicResultDTO> listHottestTopic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<TopicResultDTO> page = getPage(params);
@@ -58,7 +58,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	public PageData<TopicResultDTO> listLatestTopic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
 		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-			return new PageData<>();
+			return new PageData<>(null, 0);
 		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<TopicResultDTO> page = getPage(params);
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 5c925a089..6ef2c0629 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
@@ -106,4 +106,88 @@
         </if>
         order by ei.CREATED_TIME desc
     </select>
+
+    <!--   疑难项目分析列表查询  -->
+    <select id="selectListDifficultItemResultDTO"
+            resultType="com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO">
+        SELECT
+        t.ID,
+        t.ITEM_CONTENT,
+        t.CREATED_TIME,
+        t.operatNum,
+        t.reportFlag,
+        t.deptNum,
+        t.ITEM_STATE,
+        t.processedTime,
+        t.takeTime,
+        t.ALL_DEPT_NAMES,
+        t.EVALUATION_SCORE
+        FROM (
+        SELECT
+        ei.ID,
+        ei.ITEM_CONTENT,
+        ei.CREATED_TIME,
+        ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = ei.ID ) AS operatNum,
+        ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM esua_epdc_events.epdc_item_grid_platform eigp
+        WHERE eigp.DEL_FLAG = '0' AND eigp.REFERENCE_ID = ei.ID ) AS reportFlag,
+        ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID
+        ) AS deptNum,
+        ei.ITEM_STATE,
+        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = ei.ID AND eihp.STATE IN (5, 10) LIMIT 1 ) AS processedTime,
+        ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM
+        esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime,
+        ei.ALL_DEPT_NAMES,
+        ei.EVALUATION_SCORE
+        FROM
+        esua_epdc_events.epdc_item ei
+        WHERE
+        ei.DEL_FLAG = '0'
+        AND ei.GRID_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+        <if test="streetId != null and streetId != ''">
+            AND find_in_set(#{streetId},ei.ALL_DEPT_IDS)
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND find_in_set(#{communityId},ei.ALL_DEPT_IDS)
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND ei.GRID_ID = #{gridId}
+        </if>
+        <if test="changeItemStartTime != null and changeItemStartTime != ''">
+            AND DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;= #{changeItemStartTime}
+        </if>
+        <if test="changeItemEndTime != null and changeItemEndTime != ''">
+            AND DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;= #{changeItemEndTime}
+        </if>
+        <if test="itemState != null and itemState != ''">
+            AND ei.ITEM_STATE = #{itemState}
+        </if>
+        <if test="evaluationScore != null and evaluationScore != ''">
+            AND ei.EVALUATION_SCORE = #{evaluationScore}
+        </if>
+        ) t
+        WHERE 1=1
+        <if test="processedStartTime != null and processedStartTime != ''">
+            AND DATE_FORMAT( processedTime, '%Y-%m-%d' ) &gt;= #{processedStartTime}
+        </if>
+        <if test="processedEndTime != null and processedEndTime != ''">
+            AND DATE_FORMAT( processedTime, '%Y-%m-%d' ) &lt;= #{processedEndTime}
+        </if>
+        <if test="reportFlag != null and reportFlag != ''">
+            AND reportFlag = #{reportFlag}
+        </if>
+        <if test="orderType != null and orderType !='' and orderType == '0'">
+            ORDER BY takeTime DESC
+        </if>
+        <if test="orderType != null and  orderType !='' and orderType == '1'">
+            ORDER BY deptNum DESC
+        </if>
+        <if test="orderType != null and orderType !='' and orderType == '2'">
+            ORDER BY operatNum DESC
+        </if>
+    </select>
 </mapper>