diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/EditProgressResultDTO.java new file mode 100644 index 00000000..8a170e82 --- /dev/null +++ b/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 itemDeptDTOS; + + /** + * 处理图片(内部处理图片) + */ + private List images; + + /** + * 回复居民图片(外部处理图片) + */ + // todo 回复居民图片(外部处理图片) + private List outImages; + + /** + * 事件ID + */ +// private String eventId; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 议题ID + */ +// private String issueId; + + /** + * 项目ID + */ +// private String itemId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 5fe7c87b..5dac83a9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/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 { * @since 2020/3/7 12:54 */ void updateBatchPartyGroupName(@Param("groups") List groups); + + /** + * 业务端-议题处理进度,返回需要编辑的字段 + * + * @param issueId + * @return java.util.List + * @Author zhangyong + * @Date 13:49 2022-01-10 + **/ + List selectListEditIssueProgress(@Param("issueId") String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 63ff5996..586b60bb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/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 { * @since 2020/9/16 10:31 */ int selectIssueCountByEventId(String eventId); + + /** + * 业务端-议题处理进度,返回需要编辑的字段 + * + * @param issueId + * @return java.util.List + * @Author zhangyong + * @Date 13:49 2022-01-10 + **/ + List listEditIssueProgress(String issueId); + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index eedd2537..c65f23a9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/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 imp } } } + + @Override + public List listEditIssueProgress(String issueId) { + return baseDao.selectListEditIssueProgress(issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 373e1d3b..20bb0e55 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/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> + * @Author zhangyong + * @Date 13:39 2022-01-10 + **/ + @GetMapping("getProcessProgress/{id}") + public Result> getProcessProgress(@PathVariable("id") String id){ + List data = itemService.getProcessProgress(id); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 3c7df5a8..544b8751 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { */ void deleteBatchItemHandleIds(@Param("ids") List ids); - /** - * @Description: 根据项目id,查询当前登录人所在部门,以外的该项目关联的所有部门id + /** + * @Description: 根据项目id,查询当前登录人所在部门,以外的该项目关联的所有部门id * @Param: [itemId] 项目id * @Param: [deptId] 部门id - * @return: java.util.List - * @Author: zy - * @Date: 2020-01-09 - */ + * @return: java.util.List + * @Author: zy + * @Date: 2020-01-09 + */ List queryDeptIdList(String itemId, Long deptId); /** @@ -289,4 +290,14 @@ public interface ItemDao extends BaseDao { * @since 2020/9/22 9:52 */ void updateItemTopFlagById(@Param("formDto") ItemTopFormDTO formDto); + + /** + * 业务端-项目处理进度,返回需要编辑的字段 + * + * @param itemId + * @return java.util.List + * @Author zhangyong + * @Date 13:49 2022-01-10 + **/ + List selectListOfEditItemHandleProgressByWork(@Param("itemId") String itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index cca95279..49502b6f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { * @since 2020/9/22 9:45 */ Result modifyItemTopFlag(ItemTopFormDTO formDto); + + /** + * 获取处理进展列表信息 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:39 2022-01-10 + **/ + List getProcessProgress(String id); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 6595a51b..57c38214 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem return new Result(); } + + @Override + public List getProcessProgress(String id) { + //获取项目基本信息 + ItemEntity entity = this.selectById(id); + + // 获取项目处理进度 + List result = baseDao.selectListOfEditItemHandleProgressByWork(id); + // 项目处理表中第一条数据,为 议题转项目 + this.firstDataHandleType(result, "issue-project"); + + // 获取议题处理进度 + List 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 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 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; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 125bff9f..52d8690a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -659,4 +659,35 @@ + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 16710afe..27a87a57 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1052,4 +1052,40 @@ WHERE ID = #{formDto.itemId} + + + + + + + + + + + + + + + + + +