diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java index 722ba728..d7207e46 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java @@ -52,4 +52,9 @@ public class IssueProgressResultDTO implements Serializable { * 来源社群 */ private String groupName; + + /** + * 事件ID + */ + private String eventId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java index a0a90c95..d4f0d083 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -36,6 +36,10 @@ public class ItemHandleProgressResultDTO implements Serializable { * 操作人部门 */ private String handlerDept; + /** + * 议题ID + */ + private String issueId; /** * 吹哨部门 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml index bc2b3b29..18634095 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml @@ -11,6 +11,7 @@ + SELECT @@ -15,11 +16,13 @@ hp.CREATED_TIME AS createdTime, hp.HANDLE_ADVICE AS advice, hp.HANDLER_DEPT AS handlerDept, - hp.STATE + hp.STATE, + ei.ISSUE_ID FROM epdc_item_handle_process hp + left join epdc_item ei on ei.ID = hp.ITEM_ID WHERE - hp.DEL_FLAG = '0' + hp.DEL_FLAG = '0' and ei.DEL_FLAG = '0' AND hp.ITEM_ID = #{itemId} ORDER BY createdTime DESC