【编辑功能】已完成，处理进展 - 页面展示

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

@@ -0,0 +1,93 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import com.elink.esua.epdc.dto.item.ItemDeptDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 编辑 议题、项目处理进度（后台用）
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/21 15:08
+ */
+@Data
+public class EditProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2739821096656995025L;
+
+    /**
+     * 处理进展类型： 事件  init
+     *             议题  issue
+     *                  issue-project
+     *             项目  project
+     */
+    private String handleType;
+
+    /**
+     * 处理进度ID
+     */
+    private String id;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 操作人部门
+     */
+    private String handlerDept;
+
+    /**
+     * 时间
+     */
+    private String createdTime;
+
+    /**
+     * 项目处理意见（内部意见）（项目有）
+     */
+    private String advice;
+
+    /**
+     * 回复居民意见（外部意见）
+     */
+    private String outAdvice;
+
+    /**
+     * 吹哨部门
+     */
+    private List<ItemDeptDTO> itemDeptDTOS;
+
+    /**
+     * 处理图片（内部处理图片）
+     */
+    private List<String> images;
+
+    /**
+     * 回复居民图片（外部处理图片）
+     */
+    // todo 回复居民图片（外部处理图片）
+    private List<String> outImages;
+
+    /**
+     * 事件ID
+     */
+//    private String eventId;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 议题ID
+     */
+//    private String issueId;
+
+    /**
+     * 项目ID
+     */
+//    private String itemId;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java

@@ -204,4 +204,14 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @since 2020/3/7 12:54
      */
     void updateBatchPartyGroupName(@Param("groups") List<GroupFormDTO> groups);
+
+    /**
+     * 业务端-议题处理进度，返回需要编辑的字段
+     *
+     * @param issueId
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO>
+     * @Author zhangyong
+     * @Date 13:49 2022-01-10
+     **/
+    List<EditProgressResultDTO> selectListEditIssueProgress(@Param("issueId") String issueId);
 }

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

@@ -294,4 +294,16 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @since 2020/9/16 10:31
      */
     int selectIssueCountByEventId(String eventId);
+
+    /**
+     * 业务端-议题处理进度，返回需要编辑的字段
+     *
+     * @param issueId
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO>
+     * @Author zhangyong
+     * @Date 13:49 2022-01-10
+     **/
+    List<EditProgressResultDTO> listEditIssueProgress(String issueId);
+
+
 }

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

@@ -739,4 +739,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             }
         }
     }
+
+    @Override
+    public List<EditProgressResultDTO> listEditIssueProgress(String issueId) {
+        return baseDao.selectListEditIssueProgress(issueId);
+    }
 }

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

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.ItemTopFormDTO;
@@ -236,4 +237,17 @@ public class ItemController {
         return itemService.modifyItemTopFlag(formDto);
     }
 
+    /**
+     * 获取处理进展列表信息
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO>>
+     * @Author zhangyong
+     * @Date 13:39 2022-01-10
+     **/
+    @GetMapping("getProcessProgress/{id}")
+    public Result<List<EditProgressResultDTO>> getProcessProgress(@PathVariable("id") String id){
+        List<EditProgressResultDTO> data = itemService.getProcessProgress(id);
+        return new Result<List<EditProgressResultDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-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.events.form.GroupFormDTO;
+import com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.ItemTopFormDTO;
@@ -208,14 +209,14 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     void deleteBatchItemHandleIds(@Param("ids") List<String> ids);
 
-    /** 
+    /**
-     * @Description: 根据项目id，查询当前登录人所在部门，以外的该项目关联的所有部门id 
+     * @Description: 根据项目id，查询当前登录人所在部门，以外的该项目关联的所有部门id
      * @Param: [itemId] 项目id
      * @Param: [deptId] 部门id
-     * @return: java.util.List<java.lang.Long> 
+     * @return: java.util.List<java.lang.Long>
-     * @Author: zy 
+     * @Author: zy
-     * @Date: 2020-01-09 
+     * @Date: 2020-01-09
-     */ 
+     */
     List<Long> queryDeptIdList(String itemId, Long deptId);
 
     /**
@@ -289,4 +290,14 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @since 2020/9/22 9:52
      */
     void updateItemTopFlagById(@Param("formDto") ItemTopFormDTO formDto);
+
+    /**
+     * 业务端-项目处理进度，返回需要编辑的字段
+     *
+     * @param itemId
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO>
+     * @Author zhangyong
+     * @Date 13:49 2022-01-10
+     **/
+    List<EditProgressResultDTO> selectListOfEditItemHandleProgressByWork(@Param("itemId") String itemId);
 }

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

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.ItemTopFormDTO;
@@ -418,4 +419,14 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @since 2020/9/22 9:45
      */
     Result modifyItemTopFlag(ItemTopFormDTO formDto);
+
+    /**
+     * 获取处理进展列表信息
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO>>
+     * @Author zhangyong
+     * @Date 13:39 2022-01-10
+     **/
+    List<EditProgressResultDTO> getProcessProgress(String id);
 }

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

@@ -46,7 +46,9 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
+import com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
 import com.elink.esua.epdc.dto.item.*;
 import com.elink.esua.epdc.dto.item.form.*;
@@ -1592,4 +1594,56 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         return new Result();
     }
+
+    @Override
+    public List<EditProgressResultDTO> getProcessProgress(String id) {
+        //获取项目基本信息
+        ItemEntity entity = this.selectById(id);
+
+        // 获取项目处理进度
+        List<EditProgressResultDTO> result = baseDao.selectListOfEditItemHandleProgressByWork(id);
+        // 项目处理表中第一条数据，为 议题转项目
+        this.firstDataHandleType(result, "issue-project");
+
+        // 获取议题处理进度
+        List<EditProgressResultDTO> issueList = issueService.listEditIssueProgress(entity.getIssueId());
+        // 议题处理表中第一条数据，为 事件审核通过
+        this.firstDataHandleType(issueList, "init");
+        result.addAll(issueList);
+
+        // 事件信息
+        EditProgressResultDTO eventInfo = this.packageEventInfo(entity.getEventId());
+        result.add(eventInfo);
+
+        return result;
+    }
+
+    private void firstDataHandleType(List<EditProgressResultDTO> list, String typeName) {
+        for (int i = NumConstant.ZERO; i < list.size(); i++) {
+            if (i == list.size() - NumConstant.ONE ) {
+                list.get(i).setHandleType(typeName);
+            }
+        }
+    }
+
+    /**
+     * 组装事件信息
+     *
+     * @param eventId
+     * @return com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO
+     * @Author zhangyong
+     * @Date 17:09 2022-01-10
+     **/
+    private EditProgressResultDTO packageEventInfo(String eventId) {
+        EditProgressResultDTO result = new EditProgressResultDTO();
+        Result<EventAppDetailResultDTO> event = issueService.getEventDetail(eventId);
+        result.setCreatedTime(event.getData().getDistributeTime());
+        result.setOutAdvice(event.getData().getAdvice());
+        result.setOutAdvice(event.getData().getAdvice());
+        result.setEventContent(event.getData().getContent());
+        result.setHandleType("init");
+        // 不显示状态
+        result.setState(NumConstant.ONE_HUNDRED);
+        return result;
+    }
 }

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

@@ -659,4 +659,35 @@
         </foreach>
     </update>
 
+    <resultMap id="editIssueProgressMap" type="com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO">
+        <result property="handleType" column="handleType"/>
+        <result property="id" column="ID"/>
+        <result property="createdTime" column="createdTime"/>
+        <result property="advice" column="advice"/>
+        <result property="outAdvice" column="outAdvice"/>
+        <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="state" column="STATE"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectListEditIssueProgress" resultMap="editIssueProgressMap">
+        SELECT
+            'issue' handleType,
+            hd.ID,
+            hd.STATE,
+            hd.CREATED_TIME AS createdTime,
+            hd.ADVICE,
+            hd.HANDLER_DEPT,
+            img.IMG_URL
+        FROM
+            epdc_issue_handle hd
+            LEFT JOIN epdc_img img ON hd.ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+            AND img.IMG_TYPE = 'issueHandle'
+        WHERE
+            hd.DEL_FLAG = '0'
+            AND hd.ISSUE_ID = #{issueId}
+        ORDER BY hd.CREATED_TIME DESC
+    </select>
 </mapper>

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

@@ -1052,4 +1052,40 @@
         </if>
         WHERE ID = #{formDto.itemId}
     </update>
+
+    <resultMap id="editItemHandleMapByWork" type="com.elink.esua.epdc.dto.issue.result.EditProgressResultDTO">
+        <result property="handleType" column="handleType"/>
+        <result property="id" column="ID"/>
+        <result property="createdTime" column="createdTime"/>
+        <result property="advice" column="advice"/>
+        <result property="outAdvice" column="outAdvice"/>
+        <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="state" column="STATE"/>
+        <collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO">
+            <result property="deptName" column="DEPT_NAME"/>
+        </collection>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectListOfEditItemHandleProgressByWork" resultMap="editItemHandleMapByWork">
+        SELECT
+            'project' AS handleType,
+            hp.ID,
+            hp.CREATED_TIME AS createdTime,
+            hp.HANDLE_ADVICE AS advice,
+			hp.OUT_HANDLE_ADVICE AS outAdvice,
+            hp.HANDLER_DEPT,
+            hp.STATE,
+            itemDept.DEPT_NAME,
+            img.IMG_URL
+        FROM
+        epdc_item_handle_process hp
+        LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
+        LEFT JOIN epdc_img img ON hp.ID = img. REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND  img.DEL_FLAG = '0'
+        WHERE hp.DEL_FLAG = '0'
+        AND hp.ITEM_ID = #{itemId}
+        ORDER BY createdTime DESC
+    </select>
+
 </mapper>