From 623cef90845a358fab9edac3047f5e9fa37e3c96 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 23 May 2022 15:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyMemberController.java | 43 +++++++++++++++---- .../partymember/dao/IcPartyMemberDao.java | 8 ++-- .../impl/IcPartyMemberServiceImpl.java | 12 +++--- .../mapper/partymember/IcPartyMemberDao.xml | 36 ++++++++++++++-- .../epmet/dto/form/IcPartyMemberFormDTO.java | 5 ++- .../dto/form/IcPartyMemberListFormDTO.java | 6 ++- 6 files changed, 84 insertions(+), 26 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index ed1adc6b44..3ef1dc2439 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -8,10 +8,12 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -33,6 +35,7 @@ import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -147,8 +150,14 @@ public class IcPartyMemberController { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymembereducationstatistics") - public Result> partyMemberEducationStatistics(@RequestBody IcPartyMemberFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + public Result> partyMemberEducationStatistics(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } return new Result>().ok(icPartyMemberService.partyMemberEducationStatistics(formDTO)); } @@ -161,8 +170,14 @@ public class IcPartyMemberController { */ @PostMapping("partymemberagelist") @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result> partyMemberAgelist(@RequestBody IcPartyMemberListFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } return new Result>().ok(icPartyMemberService.getPartyMemberAgeList(formDTO)); } @@ -175,8 +190,14 @@ public class IcPartyMemberController { */ @PostMapping("partymembereducationlist") @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result> partyMemberEducationlist(@RequestBody IcPartyMemberListFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } return new Result>().ok(icPartyMemberService.getPartyMemberEducationList(formDTO)); } @@ -188,8 +209,14 @@ public class IcPartyMemberController { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymemberagestatistics") - public Result> partyMemberAgeStatistics(@RequestBody IcPartyMemberFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId()) && StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java index 0c648dc484..00ea198d81 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java @@ -46,7 +46,7 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId] * @return java.util.List */ - List getPartyMemberEducationStatistics(@Param("orgId") String orgId); + List getPartyMemberEducationStatistics(@Param("agencyId") String agencyId, @Param("orgId") String orgId); /** * @describe: 党员年龄列表 @@ -55,7 +55,7 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId, code] * @return java.util.List */ - List getPartyMemberAgeList(@Param("orgId") String orgId,@Param("code") String code); + List getPartyMemberAgeList(@Param("agencyId") String agencyId,@Param("orgId") String orgId,@Param("code") String code); /** * @describe: 党员学历列表 @@ -64,7 +64,7 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId, code] * @return java.util.List */ - List getPartyMemberEducationList(@Param("orgId") String orgId,@Param("code") String code); + List getPartyMemberEducationList(@Param("agencyId") String agencyId,@Param("orgId") String orgId,@Param("code") String code); /** * @describe: 党员年龄范围统计 @@ -73,5 +73,5 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId] * @return java.util.List */ - List getPartyMemberAgeStatistics(@Param("orgId") String orgId); + List getPartyMemberAgeStatistics(@Param("agencyId") String agencyId,@Param("orgId") String orgId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index c903e4818a..2dc1591f1f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -324,7 +324,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); Map map = new HashMap<>(); //统计组织下文化程度党员人数 - List list = baseDao.getPartyMemberEducationStatistics(formDTO.getOrgId()); + List list = baseDao.getPartyMemberEducationStatistics(formDTO.getAgencyId(),formDTO.getOrgId()); int total = 0; if (CollectionUtils.isNotEmpty(list)) { map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); @@ -353,11 +353,11 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl getPartyMemberAgeList(IcPartyMemberListFormDTO formDTO) { if (formDTO.getIsPage()) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - List list = baseDao.getPartyMemberAgeList(formDTO.getOrgId(), formDTO.getCode()); + List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } - List list = baseDao.getPartyMemberAgeList(formDTO.getOrgId(), formDTO.getCode()); + List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); } @@ -365,7 +365,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl getPartyMemberEducationList(IcPartyMemberListFormDTO formDTO) { if (formDTO.getIsPage()) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - List list = baseDao.getPartyMemberEducationList(formDTO.getOrgId(), formDTO.getCode()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); PageInfo pageInfo = new PageInfo<>(list); if (CollectionUtils.isNotEmpty(list)) { @@ -375,7 +375,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } - List list = baseDao.getPartyMemberEducationList(formDTO.getOrgId(), formDTO.getCode()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); if (CollectionUtils.isNotEmpty(list)) { list.forEach(item -> { @@ -395,7 +395,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl map = new HashMap<>(); int total = 0; //统计组织下各年龄范围人数 - List list = baseDao.getPartyMemberAgeStatistics(formDTO.getOrgId()); + List list = baseDao.getPartyMemberAgeStatistics(formDTO.getAgencyId(),formDTO.getOrgId()); if (CollectionUtils.isNotEmpty(list)) { map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue)); total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index a4a1b334f7..e74f82cd68 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -141,7 +141,14 @@ WHERE DEL_FLAG = '0' AND CULTURE IS NOT NULL - AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%')) + + + AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%')) + + + AND (AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%',#{agencyId},'%')) + + GROUP BY CULTURE