Browse Source

党群议事处理进度模块调整

dev
liuchuang 6 years ago
parent
commit
8b15a098a9
  1. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java
  2. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java
  3. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java
  4. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java
  5. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
  6. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
  7. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
  8. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
  9. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  10. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
  11. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  12. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  13. 63
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  14. 19
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java

@ -56,7 +56,7 @@ public class ApiTopicController {
* @since 2019/11/11 15:04
*/
@GetMapping("list")
public Result<List<TopicListResultDTO>> listTopic(@LoginUser TokenDto userDetail, @RequestBody TopicListFormDTO formDto) {
public Result<List<TopicListResultDTO>> listTopic(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return topicService.listOfTopic(userDetail, formDto);
}
@ -71,7 +71,7 @@ public class ApiTopicController {
* @since 2019/11/11 15:04
*/
@GetMapping("listOfMine")
public Result<List<TopicListResultDTO>> listTopicOfMine(@LoginUser TokenDto userDetail, @RequestBody TopicListFormDTO formDto) {
public Result<List<TopicListResultDTO>> listTopicOfMine(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return topicService.listTopicOfMine(userDetail, formDto);
}

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

@ -1,10 +1,10 @@
package com.elink.esua.epdc.dto.issue;
import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -48,10 +48,6 @@ public class IssueContentDetailDTO implements Serializable {
* 图片
*/
private List<String> images;
/**
* 工作反馈或处理进度
*/
private List<IssueJobFeedbackDTO> feedbackDTOList;
/**
* 事件地址
*/
@ -72,4 +68,14 @@ public class IssueContentDetailDTO implements Serializable {
* 所属类别
*/
private String categoryName;
/**
* 议题处理进度
*/
List<IssueProgressResultDTO> issueProgressResultDTOS;
/**
* 项目处理进度
*/
List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
}

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

@ -14,6 +14,10 @@ import java.util.Date;
public class IssueJobFeedbackDTO implements Serializable {
private static final long serialVersionUID = 8884285160297991105L;
/**
* 状态
*/
private Integer state;
/**
* 状态名称
*/

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

@ -1,9 +1,9 @@
package com.elink.esua.epdc.dto.issue;
import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -40,10 +40,6 @@ public class IssueWaitHandleDetailDTO implements Serializable {
* 图片
*/
private List<String> images;
/**
* 工作反馈
*/
List<IssueJobFeedbackDTO> jobFeedbackDTOS;
/**
* 事件地址
*/
@ -64,4 +60,8 @@ public class IssueWaitHandleDetailDTO implements Serializable {
* 类别
*/
private String categoryName;
/**
* 议题处理进度
*/
List<IssueProgressResultDTO> issueProgressResultDTOS;
}

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

@ -16,10 +16,15 @@ import java.util.List;
public class IssueProgressResultDTO implements Serializable {
private static final long serialVersionUID = 2739821096656995025L;
/**
* 处理进度ID
*/
private String id;
/**
* 状态
*/
private String state;
private Integer state;
/**
* 时间
*/

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

@ -4,7 +4,6 @@ import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -67,9 +66,13 @@ public class ItemContentForPCEndResultDTO implements Serializable {
*/
private List<String> images;
/**
* 项目满意度
* 用户满意度评价
*/
private String evaluationScore;
/**
* 用户满意度评价内容
*/
private String evaluationContent;
/**
* 部门满意度评价
*/

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

@ -15,6 +15,7 @@ import java.util.List;
public class ItemHandleProgressResultDTO implements Serializable {
private static final long serialVersionUID = -7709510043792716588L;
private String id;
/**
* 状态名称
*/
@ -22,7 +23,7 @@ public class ItemHandleProgressResultDTO implements Serializable {
/**
* 状态
*/
private String state;
private Integer state;
/**
* 时间
*/

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

@ -19,7 +19,6 @@ package com.elink.esua.epdc.modules.issue.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO;
import com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO;
import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO;
import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
import com.elink.esua.epdc.dto.issue.form.*;
@ -67,15 +66,6 @@ public interface IssueDao extends BaseDao<IssueEntity> {
*/
IssueContentDetailDTO selectOneIssueContentDetail(@Param("issueId") String issueId);
/**
* 工作反馈和处理进度集合
* @Params: [issueId, itemId]
* @Return: java.util.List<com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO>
* @Author: liuchuang
* @Date: 2019/9/6 16:43
*/
List<IssueJobFeedbackDTO> selectListOfJobFeedBack(@Param("issueId") String issueId, @Param("itemId") String itemId);
/**
* 屏蔽评论
* @Params: [commentId]

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

@ -40,6 +40,8 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
import com.elink.esua.epdc.dto.issue.*;
import com.elink.esua.epdc.dto.issue.form.*;
import com.elink.esua.epdc.dto.issue.result.*;
import com.elink.esua.epdc.dto.item.form.ItemProcessFormDTO;
import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
import com.elink.esua.epdc.modules.async.DeptRespondTask;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.comment.service.EventCommentService;
@ -156,7 +158,13 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
@Override
public IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id) {
return baseDao.selectOneOfWaitHandleIssueDetail(id);
// 议题详情
IssueWaitHandleDetailDTO detailDto = baseDao.selectOneOfWaitHandleIssueDetail(id);
// 议题处理进度
List<IssueProgressResultDTO> issueProgressResultDTOS = this.listIssueProgress(id);
detailDto.setIssueProgressResultDTOS(issueProgressResultDTOS);
return detailDto;
}
@Override
@ -256,18 +264,19 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
@Override
public IssueContentDetailDTO getIssueContentDetail(String issueId) {
// 项目信息
// 议题详情
IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId);
// 议题处理进度
List<IssueProgressResultDTO> issueProgressResult = this.listIssueProgress(issueId);
data.setIssueProgressResultDTOS(issueProgressResult);
ItemEntity itemEntity = itemService.getItemByIssueId(issueId);
String itemId = "";
if (null != itemEntity) {
itemId = itemEntity.getId();
// 项目处理进度
List<ItemHandleProgressResultDTO> handleProgressResult = itemService.listOfItemHandleProgressByWork(itemEntity.getId());
data.setHandleProgressResultDTOS(handleProgressResult);
}
// 议题详情
IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId);
// 反馈和处理进度
List<IssueJobFeedbackDTO> feedbackDTOList = baseDao.selectListOfJobFeedBack(issueId, itemId);
data.setFeedbackDTOList(feedbackDTOList);
return data;
}

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

@ -1,14 +1,11 @@
package com.elink.esua.epdc.modules.item.controller;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.item.service.ItemDeptService;
import com.elink.esua.epdc.modules.item.service.ItemEvaluateDeptService;
import com.elink.esua.epdc.modules.item.service.ItemInformationService;
@ -16,7 +13,6 @@ import com.elink.esua.epdc.modules.item.service.ItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
@ -149,6 +145,7 @@ public class WorkItemController {
@GetMapping("processList")
public Result<List<ItemHandleProgressResultDTO>> processList(@RequestBody ItemProcessFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return itemService.listOfItemHandleProgressByWork(formDTO);
List<ItemHandleProgressResultDTO> data = itemService.listOfItemHandleProgressByWork(formDTO.getItemId());
return new Result<List<ItemHandleProgressResultDTO>>().ok(data);
}
}

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

@ -273,10 +273,10 @@ public interface ItemService extends BaseService<ItemEntity> {
/**
* 项目处理进度
* @Params: [formDto]
* @Params: [itemId]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO>
* @Author: lipengfei
* @Date: 2019/11/18 13:32
*/
Result<List<ItemHandleProgressResultDTO>> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO);
List<ItemHandleProgressResultDTO> listOfItemHandleProgressByWork(String itemId);
}

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

@ -487,9 +487,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return baseDao.selectListOfItemHandleProgress(entity.getIssueId(), itemId, outOrInside);
}
@Override
public Result<List<ItemHandleProgressResultDTO>> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO) {
List<ItemHandleProgressResultDTO> data = baseDao.selectListOfItemHandleProgressByWork(formDTO.getItemId());
return new Result<List<ItemHandleProgressResultDTO>>().ok(data);
public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByWork(String itemId) {
return baseDao.selectListOfItemHandleProgressByWork(itemId);
}

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

@ -50,12 +50,6 @@
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
<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"/>
<result property="handlerDept" column="HANDLER_DEPT"/>
</collection>
</resultMap>
<select id="selectOneOfWaitHandleIssueDetail" resultMap="waitHandleIssueDetailResultMap">
@ -70,23 +64,9 @@
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
'【审核通过】'
WHEN 1 THEN
'【反馈】'
WHEN 2 THEN
'【已关闭】' ELSE ''
END) AS stateName,
img.IMG_URL
img.IMG_URL
FROM
epdc_issue i
LEFT JOIN epdc_issue_handle h ON i.ID = h.ISSUE_ID
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
@ -94,7 +74,7 @@
WHERE
i.DEL_FLAG = '0'
AND i.ID = #{id}
ORDER BY h.CREATED_TIME DESC, img.CREATED_TIME DESC
ORDER BY img.IMG_URL DESC
</select>
<resultMap id="issueContentDetailMap" type="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
@ -143,41 +123,6 @@
ORDER BY img.CREATED_TIME
</select>
<select id="selectListOfJobFeedBack" resultType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">
SELECT
CREATED_TIME AS createdTime,
advice,
HANDLER_DEPT AS handlerDept,
( CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END ) AS stateName
FROM
epdc_issue_handle
WHERE
DEL_FLAG = '0'
AND ISSUE_ID = #{issueId} UNION ALL
SELECT
CREATED_TIME AS createdTime,
HANDLE_ADVICE AS advice,
HANDLER_DEPT AS handlerDept,
(
CASE
WHEN STATE = 0 THEN
'【处理中】'
WHEN STATE = 5 THEN
'【已关闭】'
WHEN STATE = 10 THEN
'【已结案】' ELSE ''
END
) AS stateName
FROM
epdc_item_handle_process
WHERE
DEL_FLAG = '0'
AND ITEM_ID = #{itemId}
ORDER BY
createdTime DESC
</select>
<update id="updateCommentShieldFlag">
UPDATE epdc_event_comment SET SHIELD_FLAG = '1' WHERE ID IN
<foreach collection="commentIds" item="commentId" index="no" open="("
@ -355,6 +300,7 @@
</select>
<resultMap id="issueProgressMap" type="com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO">
<result property="id" column="ID"/>
<result property="state" column="STATE"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="advice" column="ADVICE"/>
@ -365,6 +311,7 @@
</resultMap>
<select id="selectListIssueProgress" resultMap="issueProgressMap">
SELECT
hd.ID,
hd.STATE,
hd.CREATED_TIME,
hd.ADVICE,
@ -377,6 +324,8 @@
WHERE
hd.DEL_FLAG = '0'
AND hd.ISSUE_ID = #{issueId}
ORDER BY
hd.CREATED_TIME DESC
</select>
<select id="selectOneIssueCategoryStatistics" resultType="com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO">

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

@ -553,6 +553,7 @@
createdTime DESC
</select>
<resultMap id="itemHandleMapByWork" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
<result property="id" column="ID"/>
<result property="createdTime" column="createdTime"/>
<result property="advice" column="advice"/>
<result property="handlerDept" column="handlerDept"/>
@ -566,6 +567,7 @@
</resultMap>
<select id="selectListOfItemHandleProgressByWork" resultMap="itemHandleMapByWork">
SELECT
hp.ID,
hp.CREATED_TIME AS createdTime,
hp.HANDLE_ADVICE AS advice,
hp.HANDLER_DEPT AS handlerDept,
@ -578,20 +580,7 @@
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} UNION ALL
SELECT
EVALUATION_TIME AS createdTime,
EVALUATION_CONTENT AS advice,
NICK_NAME AS handlerDept,
EVALUATION_SCORE as STATE,
null AS DEPT_NAME,
null AS IMG_URL
FROM
epdc_item
WHERE
DEL_FLAG = '0'
AND ID = #{itemId}
AND EVALUATION_SCORE IS NOT NULL
AND hp.ITEM_ID = #{itemId}
ORDER BY
createdTime DESC
</select>
@ -611,6 +600,7 @@
<result property="opposeNum" column="OPPOSE_NUM"/>
<result property="commentNum" column="COMMENT_NUM"/>
<result property="evaluationScore" column="evaluationScore"/>
<result property="evaluationContent" column="EVALUATION_CONTENT"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -636,6 +626,7 @@
WHEN 2 THEN '非常满意'
ELSE ''
END AS evaluationScore,
item.EVALUATION_CONTENT,
img.IMG_URL
FROM
epdc_item item

Loading…
Cancel
Save