From bb4be545962a30ba55bfbf1a4af141ae0a66b03b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 10:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4applygroupdetail=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E5=B1=9E=E6=80=A7=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=E4=B8=8A=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=9A=B4=E9=9C=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ApplyingGroupDetailResult2DTO.java | 71 +++++++++++++++++++ .../result/ApplyingGroupDetailResultDTO.java | 2 +- .../group/controller/ResiGroupController.java | 4 +- .../group/service/ResiGroupService.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 4 +- 5 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java new file mode 100644 index 0000000000..c07869dbe4 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java @@ -0,0 +1,71 @@ +package com.epmet.resi.group.dto.group.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 建组申请详情 请求返回实体 与NEI一致 + * @ClassName ApplyingGroupDetailResult2DTO + * @Auth wangc + * @Date 2020-04-30 10:10 + */ +@Data +public class ApplyingGroupDetailResult2DTO implements Serializable { + private static final long serialVersionUID = -924420303614397953L; + + /** + * 组Id + * */ + private String groupId; + + /** + * 组名称 + * */ + private String groupName; + + /** + * 组头像 + * */ + private String groupHeadPhoto; + + /** + * 组介绍 + * */ + private String groupIntroduction; + + /** + * 申请时间 + * */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createdTime; + + /** + * 组长名称 + * */ + private String groupLeaderName; + + /** + * 已同意该申请approved 、已驳回rejected + * */ + private String status; + + /** + * 驳回理由 + * */ + private String rejectReason; + + + /** + * 街道 + * */ + private String street; + + /** + * 未读已读标识 unread read + * */ + private String readFlag; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java index f293407dc8..205d2d433c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description 建组申请详情 + * @Description 建组申请详情 mapper查询返回 与NEI不一致 * @ClassName ApplyingGroupDetailResultDTO * @Author wangc * @date 2020.04.17 16:13 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 67549c75fe..fdd74e28a6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -263,12 +263,12 @@ public class ResiGroupController { /** * @Description 得到待审核/未审核小组信息的详情 * @Param CommonGroupIdFromDTO -> String groupId; String userId - * @return Result + * @return Result * @Author wangc * @Date 2020.04.20 14:08 **/ @PostMapping("getapplyinggroupdetail") - public Result getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO){ + public Result getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO){ ValidatorUtils.validateEntity(groupIdFromDTO); return resiGroupService.getApplyingGroupDetail(groupIdFromDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 8d3f760279..71a902430a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -240,5 +240,5 @@ public interface ResiGroupService extends BaseService { * @Author wangc * @Date 2020.04.19 23:32 **/ - Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId); + Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 1f4de40742..c905e10781 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -751,7 +751,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl getApplyingGroupDetail(CommonGroupIdFromDTO groupId){ + public Result getApplyingGroupDetail(CommonGroupIdFromDTO groupId){ //1.查询小组信息 //注意，这里查询出的组申请详情中，无论是已审核还是未审核，都是将该组信息关联到初始化组时状态为[待审核、审核通过、拒绝]其中之一的组操作记录上，并读取审核的已读未读信息，上述三种状态在一个组的所有操作记录当中只可能存在一种，与之后的屏蔽、取消屏蔽、关闭无关，如果查出多条说明建组的逻辑有问题 ApplyingGroupDetailResultDTO detail = baseDao.getApplyingGroupDetailByGroupId(groupId.getGroupId()); @@ -782,7 +782,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().ok(detail); + return new Result().ok(ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class)); } /** * @Description 给加入此网格的网格长发送消息