From 60dcfd83c9bbd245c38b441c53e6a7f21fde8f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Fri, 22 Nov 2019 10:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkIssueController.java | 2 +- .../esua/epdc/service/WorkIssueService.java | 4 ++-- .../comment/result/WorkEventsCommentsDTO.java | 21 ++++++++++++++++++- .../comment/result/WorkReplyCommentDTO.java | 12 +++++++++++ .../form/IssuePendingResponseFormDTO.java | 21 +++++++++++++++++++ .../form/IssueStateStatisticsFormDTO.java | 5 ++++- .../result/IssuePendingResponseResultDTO.java | 21 +++++++++++++++++++ .../result/IssueStateStatisticsResultDTO.java | 15 +++++++++++++ 8 files changed, 96 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java index 84c2362eb..60ef0e36b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java @@ -38,7 +38,7 @@ public class ApiWorkIssueController { } /** - *待回应列表 + * 事件列表接口（待回应/已驳回） * @param formDto * @return */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java index 3b1cf1bbe..b68366b90 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java @@ -33,14 +33,14 @@ import java.util.List; public interface WorkIssueService { /** - *议题数据统计 + * 议题数据统计 * @param formDto * @return */ Result stateStatistics(IssueStateStatisticsFormDTO formDto); /** - *待回应列表 + * 事件列表接口（待回应/已驳回） * @param formDto * @return */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java index 5acfad343..cd31b4b68 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java @@ -15,20 +15,39 @@ import java.util.List; public class WorkEventsCommentsDTO implements Serializable { private static final long serialVersionUID = 2112619345374657409L; + + /** + * 评论人昵称 + */ private String userName; + /** + * 评论人头像 + */ private String userFace; + /** + *评论时间 + */ private Date createdTime; + /** + *评论内容 + */ private String content; + /** + *点赞数 + */ private String likeCount; + /** + *点踩数 + */ private String unLikeCount; /** - * 回复评论信息 + * 回复列表 */ private List replies; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java index 722febd7f..929380f8b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java @@ -15,11 +15,23 @@ public class WorkReplyCommentDTO implements Serializable { private static final long serialVersionUID = 3501567846629315395L; + /** + *回复人昵称 + */ private String replyUserName; + /** + *回复人头像 + */ private String replyUserFace; + /** + *回复时间 + */ private Date createdTime; + /** + *回复内容 + */ private String content; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java index 7f8cc320c..f38548674 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java @@ -5,19 +5,40 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +/** + * 事件列表接口（待回应/已驳回） + */ @Data public class IssuePendingResponseFormDTO implements Serializable { + /** + *事件状态 0-待回应，2-已驳回 + */ private Integer state; + /** + *部门ID + */ private Long deptId; + /** + * + */ private List deptIdList; + /** + *页码 + */ private Integer pageIndex; + /** + * 页容量 + */ private Integer pageSize; + /** + *第一页查询发起时的时间 + */ private String timestamp; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java index 97088ba74..edd51062e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java @@ -5,12 +5,15 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +/** + * 议题数据统计 + */ @Data public class IssueStateStatisticsFormDTO implements Serializable { private static final long serialVersionUID = -8864248267071206774L; /** - * 用户所属网格ID + * 部门ID */ private Long deptId; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java index 45fee3cef..78d707fd5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java @@ -5,19 +5,40 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +/** + * 事件列表接口（待回应/已驳回） + */ @Data public class IssuePendingResponseResultDTO implements Serializable { + /** + * 事件ID + */ private String id; + /** + *用户昵称 + */ private String nickName; + /** + *事件内容 + */ private String eventContent; + /** + *提交时间 + */ private Date createdTime; + /** + *党员标识 0否；1是 + */ private String partyFlag; + /** + *用户头像 + */ private String userFace; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java index ea6d474b3..a5e17c6fd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java @@ -4,17 +4,32 @@ import lombok.Data; import java.io.Serializable; +/** + *议题数据统计 + */ @Data public class IssueStateStatisticsResultDTO implements Serializable { private static final long serialVersionUID = -4512771534907006929L; + /** + *待回应数量 + */ private Integer pendingResponseNum; + /** + *待处理数量 + */ private Integer pendingHandleNum; + /** + *已驳回数量 + */ private Integer rejectedNum; + /** + *已关闭数量 + */ private Integer closed; }