区域调度已解决、未解决列表查询

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java

@@ -13,15 +13,48 @@ import java.util.Date;
 @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;
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java

@@ -0,0 +1,57 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import com.sun.org.apache.xpath.internal.operations.String;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 区域调度-已解决项目列表
+ * @Author yinzuomei
+ * @Date 2020/2/11 15:12
+ */
+@Data
+public class ReportSolvedItemResultDTO implements Serializable {
+	private static final long serialVersionUID = -600933427201742607L;
+	/**
+	 * 主键
+	 */
+	private String id;
+	/**
+	 * 项目内容
+	 */
+	private String itemContent;
+	/**
+	 * 转项目时间
+	 */
+	private Date createdTime;
+	/**
+	 * 网格名称
+	 */
+	private String grid;
+	/**
+	 * 向网格化平台上报部门
+	 */
+	private String reportDept;
+	/**
+	 * 向网格化平台上报时间
+	 */
+	private Date reportTime;
+	/**
+	 * 最新处理部门
+	 */
+	private Date lastHandlerTime;
+	/**
+	 * 最新处理时间
+	 */
+	private String lasthandlerDept;
+	/**
+	 * 项目状态
+	 */
+	private String itemState;
+	/**
+	 * 居民评价
+	 */
+	private String evaluationScore;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import com.sun.org.apache.xpath.internal.operations.String;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 区域调度-解决中项目列表
+ * @Author yinzuomei
+ * @Date 2020/2/11 15:10
+ */
+@Data
+public class ReportUnsolvedItemResultDTO implements Serializable {
+	private static final long serialVersionUID = 2364303777789369092L;
+	/**
+	 * 主键
+	 */
+	private String id;
+	/**
+	 * 项目内容
+	 */
+	private String itemContent;
+	/**
+	 * 转项目时间
+	 */
+	private Date createdTime;
+	/**
+	 * 网格名称
+	 */
+	private String grid;
+	/**
+	 * 向网格化平台上报部门
+	 */
+	private String reportDept;
+	/**
+	 * 向网格化平台吹哨时间
+	 */
+	private Date reportTime;
+	/**
+	 * 最新进展处理部门
+	 */
+	private Date lastHandlerTime;
+	/**
+	 * 最新进展处理时间
+	 */
+	private String lasthandlerDept;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java

@@ -76,6 +76,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	 * @Description 分类统计
 	 * @Date 2020/2/11 9:41
 	 **/
+	@DataSource(name = DataSourceNames.FOURTH)
 	@Override
 	public PageData<IssueClassifiedStatisticDTO> listIssueClassifiedStatistic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java

@@ -19,9 +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.*;
-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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -84,5 +82,29 @@ public class ItemAnalysisController {
 		return new Result<PageData<DifficultItemResultDTO>>().ok(page);
 	}
 
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 区域调度-解决中项目列表
+	 * @Date 2020/2/11 15:11
+	 **/
+	@GetMapping("pageReportUnsolvedItem")
+	public Result<PageData<ReportUnsolvedItemResultDTO>> pageReportUnsolvedItem(@RequestParam Map<String, Object> params) {
+		PageData<ReportUnsolvedItemResultDTO> page = itemAnalysisService.listReportUnsolvedItemDTO(params);
+		return new Result<PageData<ReportUnsolvedItemResultDTO>>().ok(page);
+	}
 
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 区域调度-已解决项目列表
+	 * @Date 2020/2/11 15:11
+	 **/
+	@GetMapping("pageReportSolvedItem")
+	public Result<PageData<ReportSolvedItemResultDTO>> pageReportSolvedItem(@RequestParam Map<String, Object> params) {
+		PageData<ReportSolvedItemResultDTO> page = itemAnalysisService.listReportSolvedItemResultDTO(params);
+		return new Result<PageData<ReportSolvedItemResultDTO>>().ok(page);
+	}
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java

@@ -18,9 +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.*;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
-import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -59,4 +57,22 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
 	 * @Date 2020/2/11 13:14
 	 **/
 	List<DifficultItemResultDTO> selectListDifficultItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return java.util.List<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-解决中项目列表
+	 * @Date 2020/2/11 15:14
+	 **/
+	List<ReportUnsolvedItemResultDTO> selectListReportUnsolvedItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return java.util.List<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-已解决项目列表
+	 * @Date 2020/2/11 15:15
+	 **/
+	List<ReportSolvedItemResultDTO> selectListReportSolvedItemResultDTO(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java

@@ -1,9 +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.*;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
-import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 
 import java.util.Map;
 
@@ -41,4 +39,22 @@ public interface ItemAnalysisService {
 	 * @Date 2020/2/11 13:13
 	 **/
 	PageData<DifficultItemResultDTO> listDifficultItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-解决中项目列表
+	 * @Date 2020/2/11 15:13
+	 **/
+	PageData<ReportUnsolvedItemResultDTO> listReportUnsolvedItemDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-已解决项目列表
+	 * @Date 2020/2/11 15:13
+	 **/
+	PageData<ReportSolvedItemResultDTO> listReportSolvedItemResultDTO(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java

@@ -7,9 +7,7 @@ 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.*;
-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;
@@ -75,6 +73,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 	 * @Description 疑难项目分析
 	 * @Date 2020/2/11 13:13
 	 **/
+	@DataSource(name = DataSourceNames.FOURTH)
 	@Override
 	public PageData<DifficultItemResultDTO> listDifficultItemResultDTO(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
@@ -82,9 +81,48 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 			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());
 	}
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-解决中项目列表
+	 * @Date 2020/2/11 15:13
+	 **/
+	@DataSource(name = DataSourceNames.FOURTH)
+	@Override
+	public PageData<ReportUnsolvedItemResultDTO> listReportUnsolvedItemDTO(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());
+		IPage<ReportUnsolvedItemResultDTO> page = getPage(params);
+		List<ReportUnsolvedItemResultDTO> list = baseDao.selectListReportUnsolvedItemResultDTO(params);
+		return new PageData<>(list, page.getTotal());
+	}
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 区域调度-已解决项目列表
+	 * @Date 2020/2/11 15:13
+	 **/
+	@DataSource(name = DataSourceNames.FOURTH)
+	@Override
+	public PageData<ReportSolvedItemResultDTO> listReportSolvedItemResultDTO(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());
+		IPage<ReportSolvedItemResultDTO> page = getPage(params);
+		List<ReportSolvedItemResultDTO> list = baseDao.selectListReportSolvedItemResultDTO(params);
+		return new PageData<>(list, page.getTotal());
+	}
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml

@@ -191,4 +191,146 @@
             AND reportFlag = #{reportFlag}
         </if>
     </select>
+
+    <!--  区域调度-解决中项目列表  -->
+    <select id="selectListReportUnsolvedItemResultDTO"
+            resultType="com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO">
+        SELECT
+        t.ID,
+        t.ITEM_CONTENT,
+        t.CREATED_TIME,
+        t.GRID,
+        t.reportDept,
+        t.reportTime,
+        t.lastHandlerTime,
+        t.lasthandlerDept
+        FROM (
+        SELECT
+        ei.ID,
+        ei.ITEM_CONTENT,
+        ei.CREATED_TIME,
+        ei.GRID,
+        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
+        eigp.CREATED_TIME AS reportTime,
+        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
+        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lasthandlerDept
+        FROM
+        esua_epdc_events.epdc_item_grid_platform eigp
+        LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
+        AND ei.DEL_FLAG = '0'
+        WHERE
+        eigp.DEL_FLAG = '0'
+        AND ei.ITEM_STATE = 0
+        AND ei.GRID_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+        <if test='searchContent != null and searchContent != ""'>
+            AND ei.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+        </if>
+        <if test='reportStartTime != null and reportStartTime != ""'>
+            AND DATE_FORMAT( eigp.CREATED_TIME, '%Y-%m-%d' ) &gt;= #{reportStartTime}
+        </if>
+        <if test='reportEndTime != null and reportEndTime != ""'>
+            AND DATE_FORMAT( eigp.CREATED_TIME, '%Y-%m-%d' )&lt;= #{reportEndTime}
+        </if>
+        <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>
+        ORDER BY
+        ei.CREATED_TIME DESC ) t
+        WHERE 1=1
+        <if test='reportDept != null and reportDept != ""'>
+            AND EXISTS (
+            SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
+            WHERE eihp.DEL_FLAG = '0'
+            AND eihp.STATE = 15
+            AND eihp.ITEM_ID = eigp.REFERENCE_ID
+            AND eihp.HANDLER_DEPT_ID=#{reportDept}
+            LIMIT 1
+            )
+        </if>
+    </select>
+
+    <!--  区域调度-已解决项目列表  -->
+    <select id="selectListReportSolvedItemResultDTO"
+            resultType="com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO">
+        SELECT
+        t.ID,
+        t.ITEM_CONTENT,
+        t.CREATED_TIME,
+        t.GRID,
+        t.reportDept,
+        t.reportTime,
+        t.lastHandlerTime,
+        t.lasthandlerDept,
+        t.ITEM_STATE,
+        t.EVALUATION_SCORE
+        FROM (
+        SELECT
+        ei.ID,
+        ei.ITEM_CONTENT,
+        ei.CREATED_TIME,
+        ei.GRID,
+        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
+        eigp.CREATED_TIME AS reportTime,
+        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
+        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lasthandlerDept,
+        ei.ITEM_STATE,
+        ei.EVALUATION_SCORE
+        FROM
+        esua_epdc_events.epdc_item_grid_platform eigp
+        LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
+        AND ei.DEL_FLAG = '0'
+        WHERE
+        eigp.DEL_FLAG = '0'
+        AND ei.ITEM_STATE IN (5, 10)
+        AND ei.GRID_ID IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+        <if test='searchContent != null and searchContent != ""'>
+            AND ei.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+        </if>
+        <if test='reportStartTime != null and reportStartTime != ""'>
+            AND DATE_FORMAT( eigp.CREATED_TIME, '%Y-%m-%d' ) &gt;= #{reportStartTime}
+        </if>
+        <if test='reportEndTime != null and reportEndTime != ""'>
+            AND DATE_FORMAT( eigp.CREATED_TIME, '%Y-%m-%d' )&lt;= #{reportEndTime}
+        </if>
+        <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>
+        ORDER BY
+        ei.CREATED_TIME DESC ) t
+        WHERE 1=1
+        <if test='reportDept != null and reportDept != ""'>
+            AND EXISTS (
+            SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
+            WHERE eihp.DEL_FLAG = '0'
+            AND eihp.STATE = 15
+            AND eihp.ITEM_ID = eigp.REFERENCE_ID
+            AND eihp.HANDLER_DEPT_ID=#{reportDept}
+            LIMIT 1
+            )
+        </if>
+    </select>
 </mapper>