议题待处理详情数据 init

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

@@ -33,11 +33,7 @@ public class EpdcEventsDetailDTO implements Serializable {
     /**
      * 图片
      */
-    private String images;
+    private List<String> imageArray;
-    /**
-     * 图片数据
-     */
-    private String[] imageArray;
     /**
      * 事件地址
      */

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

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.issue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author LC
+ * @Date 2019/9/6 10:42
+ */
+@Data
+public class IssueJobFeedbackDTO implements Serializable {
+    private static final long serialVersionUID = 8884285160297991105L;
+
+    /**
+     * 状态名称
+     */
+    private String stateName;
+    /**
+     * 审核或反馈时间
+     */
+    private String createdTime;
+    /**
+     * 意见
+     */
+    private String advice;
+}

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

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.issue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/6 10:36
+ */
+@Data
+public class IssueWaitHandleDetailDTO implements Serializable {
+    private static final long serialVersionUID = -8149882405346393016L;
+
+    /**
+     * 发布人
+     */
+    private String nickName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 工作反馈
+     */
+    List<IssueJobFeedbackDTO> jobFeedbackDTOS;
+}

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

@@ -62,7 +62,6 @@ public class EpdcEventsController {
     @GetMapping("{id}")
     public Result<EpdcEventsDetailDTO> get(@PathVariable("id") String id){
         EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
-        data.setImageArray(data.getImages().split(","));
         return new Result<EpdcEventsDetailDTO>().ok(data);
     }
 

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

@@ -157,6 +157,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueEntity.setNickName(entity.getNickName());
         issueEntity.setUserFace(entity.getUserFace());
         issueEntity.setIssueContent(entity.getEventContent());
+        issueEntity.setDistributeTime(entity.getCreatedTime());
         issueEntity.setArea(entity.getArea());
         issueEntity.setAreaId(entity.getAreaId());
         issueEntity.setStreet(entity.getStreet());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.excel.IssueExcel;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
@@ -103,4 +104,10 @@ public class IssueController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueExcel.class);
     }
 
+    @GetMapping("waitHandleIssueDetail/{id}")
+    public Result<IssueWaitHandleDetailDTO> waitHandleIssueDetail(@PathVariable("id") String id) {
+        IssueWaitHandleDetailDTO data = issueService.getWaitHandleIssueDetail(id);
+        return new Result<IssueWaitHandleDetailDTO>().ok(data);
+    }
+
 }

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

@@ -18,9 +18,11 @@
 package com.elink.esua.epdc.modules.issue.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -35,7 +37,7 @@ import java.util.Map;
 @Mapper
 public interface IssueDao extends BaseDao<IssueEntity> {
     /**
-     * 议题待处理列表
+     * 议题待处理、已关闭、已转项目列表
      * @Params: [startTime, endTime, curPage, pageSize]
      * @Return: java.util.List<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>
      * @Author: liuchuang
@@ -43,4 +45,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<IssueWaitHandleOrClosedDTO> selectListOfIssueWaitHandleOrClosed(Map<String, Object> params);
 
+    /**
+     * 议题待处理列表详情
+     * @Params: [id]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/6 10:51
+     */
+    IssueWaitHandleDetailDTO selectOneOfWaitHandleIssueDetail(@Param("id") String id);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java

@@ -64,6 +64,11 @@ public class IssueEntity extends BaseEpdcEntity {
      */
 	private String issueContent;
 
+	/**
+	 * 发布时间
+	 */
+	private Date distributeTime;
+
     /**
      * 区
      */

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.issue.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 
@@ -93,4 +94,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @date
      */
     void delete(String[] ids);
+
+    /**
+     * 议题待处理列表详情
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/6 10:55
+     */
+    IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id);
 }

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

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
 import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.dao.IssueDao;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
@@ -95,4 +96,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id) {
+        return baseDao.selectOneOfWaitHandleIssueDetail(id);
+    }
+
 }

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

@@ -69,6 +69,11 @@ public class ItemEntity extends BaseEpdcEntity {
      */
 	private String issueContent;
 
+	/**
+	 * 发布时间
+	 */
+	private Date distributeTime;
+
     /**
      * 区
      */

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

@@ -8,7 +8,7 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="address" column="ISSUE_ADDRESS"/>
-        <collection property="images" ofType="java.lang.String">
+        <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
     </resultMap>

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

@@ -29,4 +29,40 @@
         ORDER BY
             issue.CREATED_TIME DESC
     </select>
+
+    <resultMap id="waitHandleIssueDetailResultMap" type="com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO">
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="issueContent" column="ISSUE_CONTENT"/>
+        <collection property="jobFeedbackDTOS" ofType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">
+            <result property="stateName" column="stateName"/>
+            <result property="createdTime" column="CREATED_TIME"/>
+            <result property="advice" column="ADVICE"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectOneOfWaitHandleIssueDetail" resultMap="waitHandleIssueDetailResultMap">
+        	SELECT
+                i.NICK_NAME,
+                i.DISTRIBUTE_TIME,
+                i.ISSUE_CONTENT,
+                h.ADVICE,
+                h.CREATED_TIME,
+              (CASE
+                    h.STATE
+                    WHEN 0 THEN
+                    '审核通过'
+                    WHEN 1 THEN
+                    '反馈'
+                    WHEN 2 THEN
+                    '已关闭' ELSE ''
+                 END) AS stateName
+            FROM
+                epdc_issue i
+                LEFT JOIN epdc_issue_handle h ON i.ID = h.ISSUE_ID
+                AND h.DEL_FLAG = '0'
+            WHERE
+                i.DEL_FLAG = '0'
+                AND i.ID = #{id}
+    </select>
 </mapper>