Merge branch 'dev_newRegister' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_newRegister

esua-epdc/doc/db/dev_newRegister/esua_epdc_events.sql

@@ -0,0 +1,4 @@
+-- 2019-10-27 项目表增加最近一次处理时间
+ALTER TABLE epdc_item ADD LAST_HANDLE_TIME datetime NULL COMMENT '最近一次处理时间';
+
+ALTER TABLE epdc_item_dept ADD ITEM_HANDLE_ID VARCHAR(32) NULL COMMENT '项目处理表ID';

esua-epdc/doc/db/dev_newRegister/esua_epdc_user.sql

@@ -0,0 +1,5 @@
+-- 2019-10-25 用户表去掉是否是网格长字段
+ALTER TABLE epdc_user DROP LEADER_FLAG;
+
+-- 2019-10-25 用户网格关联表增加是否是网格长字段
+ALTER TABLE epdc_user_grid_relation ADD LEADER_FLAG VARCHAR(1) NULL COMMENT '是否是网格长 0-否，1-是';

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.events;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -38,4 +39,16 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 事件地址
      */
     private String address;
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String ownGrid;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.events;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -46,4 +47,16 @@ public class EpdcRejectEventDetailDTO implements Serializable {
      * 事件图片
      */
     private List<String> images;
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String ownGrid;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -47,4 +48,24 @@ public class IssueContentDetailDTO implements Serializable {
      * 工作反馈或处理进度
      */
     private List<IssueJobFeedbackDTO> feedbackDTOList;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String ownGrid;
+    /**
+     * 所属类别
+     */
+    private String categoryName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java

@@ -25,4 +25,9 @@ public class IssueJobFeedbackDTO implements Serializable {
      * 意见
      */
     private String advice;
+
+    /**
+     * 处理部门
+     */
+    private String handlerDept;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -39,4 +40,24 @@ public class IssueWaitHandleDetailDTO implements Serializable {
      * 工作反馈
      */
     List<IssueJobFeedbackDTO> jobFeedbackDTOS;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String ownGrid;
+    /**
+     * 类别
+     */
+    private String categoryName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java

@@ -174,4 +174,9 @@ public class ItemDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 最后一次处理时间
+     */
+    private Date lastHandleTime;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDeptDTO.java

@@ -48,6 +48,11 @@ public class ItemDeptDTO implements Serializable {
      */
 	private Long deptId;
 
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
+
     /**
      * 操作人部门ID
      */
@@ -83,4 +88,9 @@ public class ItemDeptDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 项目处理表ID
+     */
+    private String itemHandleId;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java

@@ -52,4 +52,9 @@ public class ItemFormDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    /**
+     * 排序方式 0-创建时间倒叙，1-最后一次处理时间倒叙
+     */
+    private String orderType;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -63,4 +64,20 @@ public class ItemContentForPCEndResultDTO implements Serializable {
      * 部门满意度评价
      */
     private List<ItemDeptEvaluateResultDTO> deptEvaluateResultDTOS;
+    /**
+     * 地址
+     */
+    private String issueAddress;
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属类别
+     */
+    private String categoryName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -56,4 +57,17 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      * 满意度评价部门
      */
     private List<ItemEvaluateDeptDTO> evaluateDeptDTOS;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal issueLatitude;
+    /**
+     * 经度
+     */
+    private BigDecimal issueLongitude;
+    /**
+     * 所属类别
+     */
+    private String categoryName;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java

@@ -1,8 +1,10 @@
 package com.elink.esua.epdc.dto.item.result;
 
+import com.elink.esua.epdc.dto.item.ItemDeptDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 项目处理进展列表DTO
@@ -29,4 +31,9 @@ public class ItemHandleProgressResultDTO implements Serializable {
      * 操作人部门
      */
     private String handlerDept;
+
+    /**
+     * 吹哨部门
+     */
+    private List<ItemDeptDTO> itemDeptDTOS;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public enum ItemHandleCategoryEnum {
 
-    HANDLE_I_HANDLE(0, "处理"),
+    HANDLE_I_HANDLE(0, "回应"),
     HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"),
     HANDLE_CLOSE(5, "关闭"),
     HANDLE_CLOSING_CASE(10, "结案");

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

@@ -335,6 +335,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setIssueLatitude(issueEntity.getIssueLatitude());
         itemEntity.setFriendlyCommunityId(issueEntity.getFriendlyCommunityId());
         itemEntity.setItemState(EventIssueItemState.ITEM_HANDLING);
+        itemEntity.setLastHandleTime(new Date());
         return itemEntity;
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemDeptEntity.java

@@ -53,5 +53,9 @@ public class ItemDeptEntity extends BaseEpdcEntity {
 	 * 操作人部门ID
 	 */
 	private Long createdDeptId;
+	/**
+	 * 项目处理表ID
+	 */
+	private String itemHandleId;
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -162,4 +162,9 @@ public class ItemEntity extends BaseEpdcEntity {
      */
 	private Integer itemState;
 
+	/**
+	 * 最后一次处理时间
+	 */
+	private Date lastHandleTime;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemDeptService.java

@@ -68,7 +68,7 @@ public interface ItemDeptService extends BaseService<ItemDeptEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/16 20:08
      */
-    void saveItemDepts(Long createdDeptId, ItemHandleSubmitFormDTO formDTO);
+    void saveItemDepts(Long createdDeptId, ItemHandleSubmitFormDTO formDTO, String itemHandleId);
 
     /**
      * 获取参与项目流转部门

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

@@ -61,7 +61,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveItemDepts(Long createdDeptId, ItemHandleSubmitFormDTO formDTO) {
+    public void saveItemDepts(Long createdDeptId, ItemHandleSubmitFormDTO formDTO, String itemHandleId) {
         List<ItemDeptEntity> deptEntities = new ArrayList<>();
         for (ItemCirculationDeptResultDTO dto:
                 formDTO.getDeptResultDTOS()) {
@@ -70,6 +70,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
             entity.setDeptId(dto.getDeptId());
             entity.setDeptName(dto.getDeptName());
             entity.setCreatedDeptId(createdDeptId);
+            entity.setItemHandleId(itemHandleId);
             deptEntities.add(entity);
         }
         this.insertBatch(deptEntities);

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

@@ -421,8 +421,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
                 // 删除已流转协助部门
                 itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId());
+                // 记录处理记录
+                handleProcessEntity.setItemId(dto.getId());
+                handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
+                handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
+                handleProcessEntity.setHandlerDeptId(user.getDeptId());
+                itemHandleProcessService.insert(handleProcessEntity);
                 // 新增流转协助部门
-                itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto);
+                itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto, handleProcessEntity.getId());
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
                 // 更新项目状态
@@ -440,13 +446,19 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                         itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId());
                     }
                 }
+                // 记录处理记录
+                handleProcessEntity.setItemId(dto.getId());
+                handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
+                handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
+                handleProcessEntity.setHandlerDeptId(user.getDeptId());
+                itemHandleProcessService.insert(handleProcessEntity);
             }
-            // 记录处理记录
+
-            handleProcessEntity.setItemId(dto.getId());
+            // 更新项目最后一次处理时间
-            handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
+            ItemEntity itemEntity = new ItemEntity();
-            handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
+            itemEntity.setId(dto.getId());
-            handleProcessEntity.setHandlerDeptId(user.getDeptId());
+            itemEntity.setLastHandleTime(new Date());
-            itemHandleProcessService.insert(handleProcessEntity);
+            baseDao.updateById(itemEntity);
 
             // 发送消息
             newsTask.insertUserInformation(informationFormDTO);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -8,6 +8,9 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="ownGrid" column="ownGrid"/>
         <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -19,7 +22,10 @@
             i.IMG_URL,
             e.NICK_NAME,
             e.CREATED_TIME,
-            e.ISSUE_ADDRESS
+            e.ISSUE_ADDRESS,
+            e.ISSUE_LATITUDE,
+            e.ISSUE_LONGITUDE,
+            CONCAT(e.AREA,e.STREET,e.COMMUNITY,e.GRID) AS ownGrid
         FROM
             epdc_events e
             LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
@@ -92,6 +98,9 @@
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="stateName" column="STATE_NAME"/>
         <result property="advice" column="ADVICE"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="ownGrid" column="ownGrid"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -105,7 +114,10 @@
             temp.ISSUE_ADDRESS,
             '已驳回' AS STATE_NAME,
             temp.ADVICE,
-            img.IMG_URL
+            img.IMG_URL,
+            temp.ISSUE_LATITUDE,
+            temp.ISSUE_LONGITUDE,
+            CONCAT(temp.AREA,temp.STREET,temp.COMMUNITY,temp.GRID) AS ownGrid
         FROM
             epdc_events temp
             LEFT JOIN epdc_img img ON temp.ID = img.REFERENCE_ID

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -41,6 +41,11 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="ownGrid" column="ownGrid"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -48,6 +53,7 @@
             <result property="stateName" column="stateName"/>
             <result property="createdTime" column="CREATED_TIME"/>
             <result property="advice" column="ADVICE"/>
+            <result property="handlerDept" column="HANDLER_DEPT"/>
         </collection>
     </resultMap>
 
@@ -57,8 +63,14 @@
                 i.NICK_NAME,
                 i.DISTRIBUTE_TIME,
                 i.ISSUE_CONTENT,
+                i.ISSUE_ADDRESS,
+                i.ISSUE_LATITUDE,
+                i.ISSUE_LONGITUDE,
+                cate.CATEGORY_NAME,
+                CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid,
                 h.ADVICE,
                 h.CREATED_TIME,
+                h.HANDLER_DEPT,
               (CASE
                     h.STATE
                     WHEN 0 THEN
@@ -75,6 +87,8 @@
                 AND h.DEL_FLAG = '0'
                 LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
 				AND img.DEL_FLAG = '0'
+				LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID
+				AND cate.DEL_FLAG = '0'
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
@@ -85,6 +99,11 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="ownGrid" column="ownGrid"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
@@ -100,13 +119,20 @@
             e.APPROVE_NUM,
             e.OPPOSE_NUM,
             e.COMMENT_NUM,
-            img.IMG_URL
+            img.IMG_URL,
+            i.ISSUE_ADDRESS,
+            i.ISSUE_LATITUDE,
+            i.ISSUE_LONGITUDE,
+            cate.CATEGORY_NAME,
+            CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid
         FROM
             epdc_issue i
             LEFT JOIN epdc_events e ON i.EVENT_ID = e.ID
             AND e.DEL_FLAG = '0'
             LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
 			AND img.DEL_FLAG = '0'
+			LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID
+	        AND cate.DEL_FLAG = '0'
         WHERE
             i.DEL_FLAG = '0'
             AND i.ID = #{issueId}

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

@@ -99,13 +99,19 @@
                     AND t1.USER_ID = #{formDto.userId}
                 </if>
                 ORDER BY
+                <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
+                    t1.LAST_HANDLE_TIME DESC
+                </if>
                 t1.CREATED_TIME DESC
                 LIMIT #{formDto.pageIndex},#{formDto.pageSize}
             ) temp
         )
         ORDER BY
+        <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
+            item.LAST_HANDLE_TIME DESC
+        </if>
         item.CREATED_TIME DESC,
-        img.CREATED_TIME
+        img.IMG_URL
     </select>
 
     <resultMap id="itemDetailMap" type="com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO">
@@ -270,6 +276,9 @@
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="issueAddress" column="ISSUE_ADDRESS"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -281,42 +290,59 @@
             item.DISTRIBUTE_TIME,
             item.ITEM_CONTENT,
             item.ISSUE_ADDRESS,
+            item.ISSUE_LATITUDE,
+            item.ISSUE_LONGITUDE,
+            cate.CATEGORY_NAME,
             img.IMG_URL
         FROM
             epdc_item item
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
+            LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+	        AND cate.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
     </select>
 
-    <select id="selectListOfItemHandleProgress" resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
+    <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
+        <result property="createdTime" column="createdTime"/>
+        <result property="advice" column="advice"/>
+        <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="progressName" column="progressName"/>
+        <collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO">
+            <result property="deptName" column="DEPT_NAME"/>
+        </collection>
+    </resultMap>
+    <select id="selectListOfItemHandleProgress" resultMap="itemHandleMap">
         SELECT
             CREATED_TIME AS createdTime,
             advice,
             HANDLER_DEPT AS handlerDept,
-            CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName
+            CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName,
+            null AS DEPT_NAME
         FROM
             epdc_issue_handle
         WHERE
             DEL_FLAG = '0'
             AND ISSUE_ID = #{issueId} UNION ALL
         SELECT
-            CREATED_TIME AS createdTime,
+            hp.CREATED_TIME AS createdTime,
             <if test="outOrInside == 0">
-                HANDLE_ADVICE AS advice,
+                hp.HANDLE_ADVICE AS advice,
             </if>
             <if test="outOrInside == 1">
-                OUT_HANDLE_ADVICE AS advice,
+                hp.OUT_HANDLE_ADVICE AS advice,
             </if>
-            HANDLER_DEPT AS handlerDept,
+            hp.HANDLER_DEPT AS handlerDept,
-            CASE WHEN STATE = 0 THEN '【处理中】' WHEN STATE = 5 THEN '【已关闭】' WHEN STATE = 10 THEN '【已结案】' ELSE '' END AS progressName
+            CASE WHEN hp.STATE = 0 THEN '【处理中】' WHEN hp.STATE = 5 THEN '【已关闭】' WHEN hp.STATE = 10 THEN '【已结案】' ELSE '' END AS progressName,
+            itemDept.DEPT_NAME
         FROM
-            epdc_item_handle_process
+            epdc_item_handle_process hp
+            LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
         WHERE
-            DEL_FLAG = '0'
+            hp.DEL_FLAG = '0'
-            AND ITEM_ID = #{itemId} UNION ALL
+            AND hp.ITEM_ID = #{itemId} UNION ALL
         SELECT
             EVALUATION_TIME AS createdTime,
             EVALUATION_CONTENT AS advice,
@@ -329,7 +355,8 @@
             '【满意度评价】基本满意'
             WHEN 2 THEN
             '【满意度评价】非常满意' ELSE ''
-            END AS progressName
+            END AS progressName,
+            null AS DEPT_NAME
         FROM
             epdc_item
         WHERE
@@ -346,6 +373,10 @@
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="itemState" column="ITEM_STATE"/>
+        <result property="issueAddress" column="ISSUE_ADDRESS"/>
+        <result property="issueLatitude" column="ISSUE_LATITUDE"/>
+        <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
@@ -361,6 +392,10 @@
             item.DISTRIBUTE_TIME,
             item.ITEM_CONTENT,
             item.ITEM_STATE,
+            item.ISSUE_ADDRESS,
+            item.ISSUE_LATITUDE,
+            item.ISSUE_LONGITUDE,
+            cate.CATEGORY_NAME,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,
@@ -377,6 +412,8 @@
             AND eve.DEL_FLAG = '0'
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
 			AND img.DEL_FLAG = '0'
+			LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+			AND cate.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}