From 6f110ffab6b2fc0d360517c87f104f69e680906a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Apr 2020 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/ServiceConstant.java | 5 ++ epmet-module/gov-grid/gov-grid-server/pom.xml | 6 ++ .../epmet/controller/ResiGroupController.java | 22 ++++++- .../com/epmet/feign/ResiGroupFeignClient.java | 28 ++++++++ .../ResiGroupFeignClientFallBack.java | 24 +++++++ .../ResiPartymemberFeignClientFallBack.java | 4 +- .../com/epmet/service/ResiGroupService.java | 12 ++++ .../epmet/service/ResiWarmheartedService.java | 2 + .../service/impl/ResiGroupServiceImpl.java | 13 ++++ .../impl/ResiWarmheartedServiceImpl.java | 2 + .../dto/group/form/GroupAuditedFromDTO.java | 36 ++++++++++ .../group/result/GroupAuditedResultDTO.java | 45 +++++++++++++ .../group/controller/ResiGroupController.java | 22 +++++-- .../epmet/modules/group/dao/ResiGroupDao.java | 7 ++ .../group/service/ResiGroupService.java | 12 ++-- .../service/impl/ResiGroupServiceImpl.java | 66 +++++++++++-------- .../resources/mapper/group/ResiGroupDao.xml | 24 +++++++ .../modules/feign/EpmetUserFeignClient.java | 2 +- .../dao/ResiWarmheartedApplyDao.java | 6 +- .../impl/ResiWarmheartedApplyServiceImpl.java | 19 +----- .../warmhearted/ResiWarmheartedApplyDao.xml | 14 ++++ 21 files changed, 312 insertions(+), 59 deletions(-) create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index eab4df7b72..6083e647f6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -73,4 +73,9 @@ public interface ServiceConstant { * 消息服务 */ String EPMET_MESSAGE_SERVER = "epmet-message-server"; + + /** + * 楼院小组 + */ + String RESI_GROUP_SERVER ="resi-group-server"; } diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index bad91380e3..7728630e09 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -57,6 +57,12 @@ 2.0.0 compile + + com.epmet + resi-group-client + 2.0.0 + compile + diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index 22fe6093a8..0dec7e9d03 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -1,8 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; +import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; +import com.epmet.service.ResiGroupService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Description 政府端管理楼院小组业务 * @ClassName ResiGroupController @@ -12,5 +21,16 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("resi/group") public class ResiGroupController { - + @Autowired + ResiGroupService resiGroupService; + /** + * 小组审核历史列表 + * + * @param formDTO 参数 + * @return + */ + @PostMapping("audited") + public Result> audited(@RequestBody GroupAuditedFromDTO formDTO) { + return resiGroupService.audited(formDTO); + } } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..9bc9428a86 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -0,0 +1,28 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; +import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; +import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 15:24 + */ +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +public interface ResiGroupFeignClient { + /** + * 小组审核历史列表 + * + * @param formDTO 参数 + * @return Result> + */ + @PostMapping("/resi/group/group/audited") + Result> audited(GroupAuditedFromDTO formDTO); +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..b95ccce2c7 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,24 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.ResiGroupFeignClient; +import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; +import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 15:27 + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + @Override + public Result> audited(GroupAuditedFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "audited", formDTO); + } +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index c56c46dd56..b656788cfb 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -1,5 +1,7 @@ package com.epmet.feign.fallback; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO; @@ -17,6 +19,6 @@ import java.util.List; public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { @Override public Result> audited(ResiWarmheartedAuditedFromDTO formDTO) { - return null; + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", formDTO); } } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java index b84868c798..425f0f5bd2 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java @@ -1,5 +1,11 @@ package com.epmet.service; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; +import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; + +import java.util.List; + /** * @Description * @IntefaceName ResiGroupService @@ -7,4 +13,10 @@ package com.epmet.service; * @date 2020.04.16 15:40 */ public interface ResiGroupService { + /** + * 小组审核历史列表 + * @param formDTO 参数 + * @return Result> + */ + Result> audited(GroupAuditedFromDTO formDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java index a06cf0a203..9c7474341d 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiWarmheartedService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; +import org.springframework.stereotype.Service; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @Author wangc * @date 2020.04.16 15:37 */ +@Service public interface ResiWarmheartedService { /** * 热心居民审核历史列表 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java index b1161225ee..f20b368b9f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java @@ -1,8 +1,15 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.ResiGroupFeignClient; +import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; +import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; import com.epmet.service.ResiGroupService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description * @ClassName ResiGroupServiceImpl @@ -11,4 +18,10 @@ import org.springframework.stereotype.Service; */ @Service public class ResiGroupServiceImpl implements ResiGroupService{ + @Autowired + private ResiGroupFeignClient resiGroupFeignClient; + @Override + public Result> audited(GroupAuditedFromDTO formDTO) { + return resiGroupFeignClient.audited(formDTO); + } } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java index 9fe0ecc8c9..1ae0f99261 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFro import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; import com.epmet.service.ResiWarmheartedService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; * @Author wangc * @date 2020.04.16 15:41 */ +@Service public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { @Autowired private ResiPartymemberFeignClient resiPartymemberFeignClient; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java new file mode 100644 index 0000000000..f1401ff8df --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupAuditedFromDTO.java @@ -0,0 +1,36 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 13:39 + */ +@Data +public class GroupAuditedFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 客户id + */ + @NotBlank(message = "客户id不能为空") + private String customerId; + /** + * 网格id + */ + @NotBlank(message = "网格id不能为空") + private String gridId; + /** + * 页码 + */ + @NotBlank(message = "页码不能为空") + private Integer pageNo; + /** + * 每页显示数量 + */ + @NotBlank(message = "每页显示数量不能为空") + private Integer pageSize; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java new file mode 100644 index 0000000000..8c2f0cd7cf --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupAuditedResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.group.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 13:40 + */ +@Data +public class GroupAuditedResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 小组ID + */ + private String groupId; + /** + * 小组名称 + */ + private String groupName; + /** + * 小组头像 + */ + private String groupHeadPhoto; + /** + * 小组介绍 + */ + private String groupIntroduction; + /** + * 小组状态已驳回rejected ，已通过approved + */ + private String status; + /** + * 审核时间HH:mm + */ + private Date auditedTime; + /** + * 消息通知内容 + */ + private String messageText; + +} 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 ef1bbd22c8..7dbe4179ba 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 @@ -26,10 +26,7 @@ import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.CreatedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO; -import com.epmet.resi.group.dto.group.result.MyGroupResultDTO; -import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO; +import com.epmet.resi.group.dto.group.result.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,10 +49,11 @@ public class ResiGroupController { private ResiGroupService resiGroupService; @GetMapping("test/{test}") - public Result test(@PathVariable("test")String test){ - int result=1/0; + public Result test(@PathVariable("test") String test) { + int result = 1 / 0; return new Result().ok("请求成功啦❤"); } + /** * @param tokenDto * @param myGroupFormDTO @@ -220,4 +218,16 @@ public class ResiGroupController { ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO); } + + /** + * 小组审核历史列表 + * + * @param formDTO 参数 + * @return Result> + */ + @PostMapping("audited") + public Result> audited(GroupAuditedFromDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return resiGroupService.audited(formDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index bf67a9ebd5..6c6d0aaf26 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -106,4 +106,11 @@ public interface ResiGroupDao extends BaseDao { * @Date 2020/3/30 16:03 **/ List checkResiGroupName(ApplyCreateGroupFormDTO applyCreateGroupFormDTO); + + /** + * 查询小组审核历史列表 + * @param formDTO + * @return + */ + List selectAuditedGroupList(GroupAuditedFromDTO formDTO); } 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 39bac55512..787b160f6c 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 @@ -27,10 +27,7 @@ import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.CreatedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO; -import com.epmet.resi.group.dto.group.result.MyGroupResultDTO; -import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO; +import com.epmet.resi.group.dto.group.result.*; import java.util.List; import java.util.Map; @@ -204,4 +201,11 @@ public interface ResiGroupService extends BaseService { * @Date 2020/4/1 0:00 **/ UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId); + + /** + * 小组审核历史列表 + * @param formDTO 参数 + * @return Result> + */ + Result> audited(GroupAuditedFromDTO formDTO); } 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 5d1a0ac277..75f07cc192 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 @@ -33,7 +33,6 @@ import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; -import com.epmet.modules.exception.ModuleErrorCode; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.dao.ResiGroupOperationDao; @@ -54,10 +53,7 @@ import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.group.*; import com.epmet.resi.group.dto.group.form.*; -import com.epmet.resi.group.dto.group.result.CreatedResultDTO; -import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO; -import com.epmet.resi.group.dto.group.result.MyGroupResultDTO; -import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import org.apache.commons.lang3.StringUtils; @@ -314,7 +310,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl param = new HashMap<>(); - param.put("resiGroupId",resiGroupDTO.getId()); + Map param = new HashMap<>(); + param.put("resiGroupId", resiGroupDTO.getId()); List statisticalList = resiGroupStatisticalService.list(param); - if(null != statisticalList && statisticalList.size() > 0){ - ResiGroupInfoRedisDTO groupRedis = transferToGroupInfoRedis(resiGroupDTO,statisticalList.get(0)); + if (null != statisticalList && statisticalList.size() > 0) { + ResiGroupInfoRedisDTO groupRedis = transferToGroupInfoRedis(resiGroupDTO, statisticalList.get(0)); resiGroupRedis.set(groupRedis); - }else{ + } else { //当没有查询到组统计信息时 UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO(); userRoleFormDTO.setApp("resi"); @@ -502,11 +498,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> audited(GroupAuditedFromDTO formDTO) { + Result> result = new Result<>(); + //查询条件 + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + //获取审核列表 + List resultList = baseDao.selectAuditedGroupList(formDTO); + + return result.ok(resultList); + } + /** + * @return ResiGroupInfoRedisDTO * @Description 将ResiGroupDTO与ResiGroupStatisticalDTO转换成ResiGroupInfoRedisDTO * @Param ResiGroupDTO * @Param ResiGroupStatisticalDTO - * @return ResiGroupInfoRedisDTO * @Author wangc * @Date 2020.04.13 16:36 **/ - private ResiGroupInfoRedisDTO transferToGroupInfoRedis(ResiGroupDTO groupDTO,ResiGroupStatisticalDTO statisticalDTO){ + private ResiGroupInfoRedisDTO transferToGroupInfoRedis(ResiGroupDTO groupDTO, ResiGroupStatisticalDTO statisticalDTO) { ResiGroupStatisticalInfoRedisDTO statisticalObjct = - ConvertUtils.sourceToTarget(statisticalDTO,ResiGroupStatisticalInfoRedisDTO.class); + ConvertUtils.sourceToTarget(statisticalDTO, ResiGroupStatisticalInfoRedisDTO.class); statisticalObjct.setTotalEarnestMembers(statisticalDTO.getTotalEarnestMemebers()); statisticalObjct.setTotalNormalMembers(statisticalDTO.getTotalNormalMemebers()); ResiGroupInfoRedisDTO targetObject = - ConvertUtils.sourceToTarget(groupDTO,ResiGroupInfoRedisDTO.class); + ConvertUtils.sourceToTarget(groupDTO, ResiGroupInfoRedisDTO.class); targetObject.setGroupId(groupDTO.getId()); targetObject.setGroupState(groupDTO.getState()); SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN); - if(null != groupDTO.getLatestTopicPublishDate()){ + if (null != groupDTO.getLatestTopicPublishDate()) { targetObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate())); } targetObject.setGroupStatisticalInfo(statisticalObjct); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index a4b6723afc..05bf42e0d8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -191,4 +191,28 @@ AND rg.GRID_ID = #{gridId} AND rg.STATE in('approved','under_auditting') + + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index c81e0f99ae..6f15d6b399 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -56,7 +56,7 @@ public interface EpmetUserFeignClient { * @return com.epmet.commons.tools.utils.Result> * @Date 2020/4/7 18:24 **/ - @PostMapping("getuserresiinfolist") + @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist") Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java index 843eac1b54..a8378b6f4f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java @@ -18,12 +18,14 @@ package com.epmet.modules.warmhearted.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.commons.tools.utils.Result; import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFromDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 热心居民申请表 * @@ -40,4 +42,6 @@ public interface ResiWarmheartedApplyDao extends BaseDao selectAuditedApplyList(ResiWarmheartedAuditedFromDTO params); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index 3a4fd5c245..d605c690af 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -246,11 +246,10 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl> result = new Result<>(); List resultList = new ArrayList<>(); //查询条件 - ResiWarmheartedApplyDTO applyDTO = ConvertUtils.sourceToTarget(formDTO, ResiWarmheartedApplyDTO.class); - applyDTO.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); //获取审核列表 - List applyList = - baseDao.selectList(getWrapper(applyDTO).orderByDesc("UPDATED_TIME")); + List applyList = baseDao.selectAuditedApplyList(formDTO); if (null == applyList || applyList.size() == 0) { return result.ok(resultList); } @@ -280,16 +279,4 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl getWrapper(ResiWarmheartedApplyDTO params) { - String customerId = params.getCustomerId(); - String gridId = params.getGridId(); - String auditStatus = params.getAuditStatus(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId) - .eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId) - .ne(StringUtils.isNotBlank(auditStatus), "AUDIT_STATUS", auditStatus); - - return wrapper; - } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml index ba8099f0fb..a89bddb810 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml @@ -56,6 +56,20 @@ AND rw.audit_status != #{auditStatus} + \ No newline at end of file