未解决项目列表查询

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

@@ -0,0 +1,57 @@
+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/10 18:58
+ */
+@Data
+public class UnsolvedItemResultDTO implements Serializable {
+	private static final long serialVersionUID = 7659596790013430029L;
+	/**
+	 * epdc_item表主键
+	 */
+	private String id;
+
+	/**
+	 * 议题内容-项目摘要
+	 */
+	private String itemContent;
+
+	/**
+	 * 发布时间
+	 */
+	private Date releaseTime;
+
+	/**
+	 * 所有部门
+	 */
+	private String allDeptNames;
+
+	/**
+	 * 发布人用户昵称
+	 */
+	private String nickName;
+
+	/**
+	 * 处理次数
+	 */
+	private Integer solveNum;
+
+	/**
+	 *最新进展处理时间
+	 */
+	private Date latestHandleTime;
+
+	/**
+	 * 最新进展处理部门
+	 */
+	private String latestHandleDeptName;
+
+
+}

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

@@ -20,6 +20,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.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -56,4 +57,16 @@ public class ItemController {
 		return new Result<PageData<ItemResultDTO>>().ok(page);
 	}
 
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 未解决项目列表查询
+	 * @Date 2020/2/10 19:08
+	 **/
+	@GetMapping("pageUnsolvedItem")
+	public Result<PageData<UnsolvedItemResultDTO>> pageUnsolvedItem(@RequestParam Map<String, Object> params) {
+		PageData<UnsolvedItemResultDTO> page = itemService.listUnsolvedItemResultDTO(params);
+		return new Result<PageData<UnsolvedItemResultDTO>>().ok(page);
+	}
 }

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

@@ -19,6 +19,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.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -39,4 +40,13 @@ public interface ItemDao extends BaseDao<ItemResultDTO> {
 	 * @Date 2020/2/10 13:53
 	 **/
 	List<ItemResultDTO> selectListHottestItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return java.util.List<com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO>
+	 * @Author yinzuomei
+	 * @Description 未解决项目列表查询
+	 * @Date 2020/2/10 19:16
+	 **/
+	List<UnsolvedItemResultDTO> selectListUnsolvedItemResultDTO(Map<String, Object> params);
 }

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

@@ -2,6 +2,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.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 
 import java.util.Map;
 
@@ -21,4 +22,13 @@ public interface ItemService {
 	 * @Date 2020/2/10 13:46
 	 **/
 	PageData<ItemResultDTO> listItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 未解决项目列表查询
+	 * @Date 2020/2/10 19:11
+	 **/
+	PageData<UnsolvedItemResultDTO> listUnsolvedItemResultDTO(Map<String, Object> params);
 }

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

@@ -8,6 +8,7 @@ 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.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.stereotype.Service;
@@ -38,4 +39,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemResultDTO> imp
 		List<ItemResultDTO> list = baseDao.selectListHottestItemResultDTO(params);
 		return new PageData<>(list, page.getTotal());
 	}
+
+	/**
+	 * @param params
+	 * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
+	 * @Author yinzuomei
+	 * @Description 未解决项目列表查询
+	 * @Date 2020/2/10 19:13
+	 **/
+	@Override
+	@DataSource(name = DataSourceNames.FOURTH)
+	public PageData<UnsolvedItemResultDTO> listUnsolvedItemResultDTO(Map<String, Object> params) {
+		UserDetail userDetail = SecurityUser.getUser();
+		params.put("deptIdList", userDetail.getDeptIdList());
+		IPage<UnsolvedItemResultDTO> page = getPage(params);
+		List<UnsolvedItemResultDTO> list = baseDao.selectListUnsolvedItemResultDTO(params);
+		return new PageData<>(list, page.getTotal());
+	}
 }

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

@@ -50,4 +50,55 @@
         </if>
         ORDER BY expressAttitudeNum DESC
     </select>
+
+    <!--  未解决项目列表查询  -->
+    <select id="selectListUnsolvedItemResultDTO" resultType="com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO">
+        select ei.id,
+        ei.ITEM_CONTENT,
+        ei.CREATED_TIME as releaseTime,
+        ei.ALL_DEPT_NAMES,
+        ei.NICK_NAME,
+        (select count(1) from epdc_item_handle_process p
+        where p.DEL_FLAG='0'
+        and p.ITEM_ID=ei.id)as solveNum,
+        (select CREATED_TIME from epdc_item_handle_process p where p.DEL_FLAG='0'
+        and p.ITEM_ID=ei.id
+        order by p.CREATED_TIME desc
+        limit 1)as latestHandleTime,
+        (select p.HANDLER_DEPT from epdc_item_handle_process p where p.DEL_FLAG='0'
+        and p.ITEM_ID=ei.id
+        order by p.CREATED_TIME desc
+        limit 1)as latestHandleDeptName
+        from epdc_item ei
+        where ei.DEL_FLAG='0'
+        AND EI.ITEM_STATE='0'
+        <if test='searchContent != null and searchContent != ""'>
+            AND ei.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (ei.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
+        </if>
+        <if test="deptIdList!=null and deptIdList.size()>0">
+            and ei.GRID_ID in
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        order by ei.CREATED_TIME desc
+    </select>
 </mapper>