From 785bcba26d7ca2ac1b45cbf1f46a01819426f65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Thu, 21 Nov 2019 19:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E7=9A=84=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkIssueController.java | 11 ++++++ .../esua/epdc/feign/WorkIssueFeignClient.java | 10 +++++ .../WorkIssueFeignClientFallback.java | 7 ++++ .../esua/epdc/service/WorkIssueService.java | 11 ++++++ .../service/impl/WorkIssueServiceImpl.java | 12 ++++++ .../comment/form/WorkCommentReplyFormDTO.java | 28 ++++++++++++++ .../comment/result/WorkEventsCommentsDTO.java | 34 +++++++++++++++++ .../comment/result/WorkReplyCommentDTO.java | 25 ++++++++++++ .../epdc/dto/events/EpdcEventsDetailDTO.java | 8 ++++ .../controller/AppEventCommentController.java | 11 ++++++ .../modules/comment/dao/EventCommentDao.java | 9 +++++ .../comment/service/EventCommentService.java | 10 +++++ .../service/impl/EventCommentServiceImpl.java | 14 +++++++ .../events/service/EpdcEventsService.java | 2 +- .../modules/issue/service/IssueService.java | 4 +- .../mapper/comment/EventCommentDao.xml | 38 +++++++++++++++++++ .../resources/mapper/events/EpdcEventsDao.xml | 9 +++++ .../main/resources/mapper/issue/IssueDao.xml | 7 +++- 18 files changed, 245 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java 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 9a065e2cd..84c2362eb 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 @@ -4,6 +4,8 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.category.EventCategoryDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -121,4 +123,13 @@ public class ApiWorkIssueController { ValidatorUtils.validateEntity(dto); return workIssueService.handleSubmit(dto); } + + /** + * + * 事件评论回复列表接口 + */ + @GetMapping("event/commentReplyList") + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){ + return workIssueService.commentReplyList(workCommentReplyFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java index 8be4598ed..6e7af1e0b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -105,4 +107,12 @@ public interface WorkIssueFeignClient { */ @PostMapping(value = "events/epdc-app/work/issue/handleSubmit", consumes = MediaType.APPLICATION_JSON_VALUE) Result handleSubmit(IssueWaitHandleSubmitFormDTO dto); + + /** + * 工作端-事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + @GetMapping(value = "events/epdc-app/comment/commentReplyList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java index 3bd46e04e..ebe5c318d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; @@ -71,4 +73,9 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient { public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleSubmit", dto); } + + @Override + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentReplyList", workCommentReplyFormDTO); + } } 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 5cc412493..3b1cf1bbe 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 @@ -20,6 +20,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -100,4 +102,13 @@ public interface WorkIssueService { * @return */ Result handleSubmit(IssueWaitHandleSubmitFormDTO dto); + + /** + * 事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO); + + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java index b711f15c9..aeaf7ae18 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java @@ -19,6 +19,8 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -137,4 +139,14 @@ public class WorkIssueServiceImpl implements WorkIssueService { public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) { return workIssueFeignClient.handleSubmit(dto); } + + /** + * 事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + @Override + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) { + return workIssueFeignClient.commentReplyList(workCommentReplyFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java new file mode 100644 index 000000000..1fcc34f1b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.dto.comment.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 事件评论回复列表接口 + * + */ +@Data +public class WorkCommentReplyFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String commentId; + +} 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 new file mode 100644 index 000000000..5acfad343 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.comment.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 事件评论DTO + * @Author LC + * @Date 2019/9/6 17:20 + */ +@Data +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 new file mode 100644 index 000000000..722febd7f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.comment.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 被回复的评论 + * @Author LC + * @Date 2019/9/6 17:25 + */ +@Data +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/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index 41d97bbef..5c87441d8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java @@ -54,6 +54,14 @@ public class EpdcEventsDetailDTO implements Serializable { * 事件地址 */ private String address; + /** + * 图片 + */ + private List handleResidentImages; + /** + * 事件地址 + */ + private String advice; /** * 纬度 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java index 7c8a8e504..66e4921f2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java @@ -23,7 +23,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; import com.elink.esua.epdc.modules.comment.service.EventCommentService; @@ -87,4 +89,13 @@ public class AppEventCommentController { public Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){ return eventCommentService.selectWorkHotOrNewEventComment(formDTO); } + + /** + * + * 事件评论回复列表接口 + */ + @GetMapping("commentReplyList") + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){ + return eventCommentService.commentReplyList(workCommentReplyFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java index 6ac2beff4..3ad1dcce4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java @@ -18,7 +18,10 @@ package com.elink.esua.epdc.modules.comment.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO; @@ -103,4 +106,10 @@ public interface EventCommentDao extends BaseDao { List selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); + /** + * 工作端-事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + WorkEventsCommentsDTO commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java index aef267b22..61afb820c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java @@ -24,7 +24,9 @@ import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO; import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO; import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; @@ -170,4 +172,12 @@ public interface EventCommentService extends BaseService { * @return */ Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); + + + /** + * 工作端-事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 4dd77ccdb..caf235af1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -31,7 +31,9 @@ import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; @@ -357,4 +359,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl list = baseDao.selectWorkHotOrNewEventComment(formDTO); return new Result>().ok(list); } + + /** + * 工作端-事件评论回复列表接口 + * @param workCommentReplyFormDTO + * @return + */ + @Override + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) { + WorkEventsCommentsDTO workEventsCommentsDTO = baseDao.commentReplyList(workCommentReplyFormDTO); + return new Result().ok(workEventsCommentsDTO); + + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 00f52163b..ae2208a88 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -195,6 +195,6 @@ public interface EpdcEventsService extends BaseService { * @param formDto * @return */ - Result> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto); + Result> listIssuePendingResponse(IssuePendingResponseFormDTO formDto); } 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 7f3476dc4..beccfff2e 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 @@ -219,14 +219,14 @@ public interface IssueService extends BaseService { * @param formDto * @return */ - Result stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto); + Result stateStatistics(IssueStateStatisticsFormDTO formDto); /** * 工作端-待回应列表 * @param formDto * @return */ - Result> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto); + Result> listIssuePendingResponse(IssuePendingResponseFormDTO formDto); /** * 工作端-议题待处理或者已关闭的最新最热列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index 0d5d7ce8b..764b5eefc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -205,4 +205,42 @@ LIMIT #{pageIndex},#{pageSize} + + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 4720a63e3..7926cb7e7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -18,6 +18,9 @@ + + + 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 e05b1a6ce..f588d6f2b 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 @@ -536,12 +536,15 @@ #{id} #{timestamp} + ORDER BY + ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC, + issue.DISTRIBUTE_TIME DESC LIMIT #{pageIndex},#{pageSize} ) temp ) ORDER BY - statementNum DESC - issue.DISTRIBUTE_TIME DESC + statementNum DESC, + issue.DISTRIBUTE_TIME DESC