From 1f675bf4c46a6118fbc7de229769065402df8f5e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 12:30:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=A6=E5=8E=86sql=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 32 +++++++++---------- .../main/resources/mapper/IcResiUserDao.xml | 12 +++++++ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index d87b068e73..1d9b9a8a25 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -4046,13 +4046,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); - if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); - } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + // DictListFormDTO dictFormDTO = new DictListFormDTO(); + // dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + // Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + // if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); + // } + // Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4073,7 +4073,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); + // resi.setEducationName(educationMap.get(resi.getEducationCode())); GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); if (null != gridInfoCache) { resi.setGridName(gridInfoCache.getGridNamePath()); @@ -4106,13 +4106,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));*/ if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4124,12 +4124,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code); - if(CollectionUtils.isNotEmpty(list)){ - list.forEach(resi -> { - // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); - }); - } + // if(CollectionUtils.isNotEmpty(list)){ + // list.forEach(resi -> { + // // 学历名称 + // resi.setEducationName(educationMap.get(resi.getEducationCode())); + // }); + // } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 5db97e1f5e..b5e5b604d2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1673,6 +1673,18 @@ ( CASE WHEN u.GENDER = '1' THEN '男' WHEN u.GENDER = '2' THEN '女' ELSE '未知' END ) AS genderName, YEAR (NOW())- SUBSTR( u.BIRTHDAY, 1, 4 ) AS age, u.CULTURE AS educationCode, + ( + case when u.CULTURE='0' then '小学及文盲' + when u.CULTURE='1' then '初中' + when u.CULTURE='2' then '高中' + when u.CULTURE='3' then '大专' + when u.CULTURE='4' then '本科' + when u.CULTURE='5' then '硕士' + when u.CULTURE='6' then '博士' + when u.CULTURE='7' then '中专' + else '' + end + )as educationName, '' AS educationName, IFNULL(u.CULTURE,'')AS educationCode, u.BIRTHDAY AS birthday From cda40ad9d556f7d0b9ad9ef1df9b9b5415af6f78 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:03:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/IcPartyOrgService.java | 8 ++ .../service/impl/IcPartyOrgServiceImpl.java | 24 ++++++ .../controller/IcPartyMemberController.java | 81 ++++++++++--------- .../service/IcPartyMemberService.java | 8 ++ .../impl/IcPartyMemberServiceImpl.java | 13 ++- .../dto/form/IcPartyMemberListFormDTO.java | 11 +++ .../dto/result/PartyMemberAgeResultDTO.java | 9 +++ .../result/PartyMemberEducationResultDTO.java | 7 ++ .../resi/PartymemberPortraitResultDTO.java | 19 +++++ 9 files changed, 139 insertions(+), 41 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index aa13fbfec8..5764d703d3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -158,4 +158,12 @@ public interface IcPartyOrgService extends BaseService { */ void editPrincipal(EditPrincipalFormDTO formDTO); + /** + * 获取工作人员所属组织下的党组织 + * @param customerId + * @param staffId + * @return + */ + IcPartyOrgEntity getIcPartyOrg(String customerId,String staffId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 0b18281ce5..b13a9b573a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -503,4 +503,28 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, customerId); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + IcPartyOrgEntity icPartyOrgEntity = baseDao.selectOne(orgWrapper); + if (null == icPartyOrgEntity) { + log.warn("当前工作人员所属组织下，暂无党组织，当前"); + } + return icPartyOrgEntity; + } } 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 7628cfbb82..1965fd546b 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 @@ -4,21 +4,18 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -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.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; 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.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -33,8 +30,9 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -79,8 +77,10 @@ public class IcPartyMemberController implements ResultDataResolver { @Autowired private IcPartyMemberService icPartyMemberService; + // @Autowired + // private IcPartyOrgDao icPartyOrgDao; @Autowired - private IcPartyOrgDao icPartyOrgDao; + private IcPartyOrgService icPartyOrgService; @RequestMapping("page") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @@ -230,6 +230,26 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result(); } + + /** + * @describe: 统计分析-党员年龄范围统计 + * @author wangtong + * @date 2022/5/23 10:19 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("partymemberagestatistics") + public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org =icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == org) { + return new Result>().ok(new ArrayList<>()); + } + formDTO.setOrgId(org.getId()); + } + return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); + } + /** * @describe: 统计分析-党员学历统计 * @author wangtong @@ -240,7 +260,7 @@ public class IcPartyMemberController implements ResultDataResolver { @PostMapping("partymembereducationstatistics") public Result> partyMemberEducationStatistics(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new ArrayList<>()); } @@ -260,7 +280,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -280,7 +300,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -290,42 +310,23 @@ public class IcPartyMemberController implements ResultDataResolver { } /** - * @describe: 统计分析-党员年龄范围统计 - * @author wangtong - * @date 2022/5/23 10:19 - * @params [formDTO] - * @return com.epmet.commons.tools.utils.Result> - */ - @PostMapping("partymemberagestatistics") - public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("partymember-portrait-list") + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { - return new Result>().ok(new ArrayList<>()); + return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); - } - - /** - * @describe: 组装党组织信息 - * @author wangtong - * @date 2022/7/8 16:46 - * @params [tokenDto, formDTO] - * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity - */ - public IcPartyOrgEntity setOrgId(TokenDto tokenDto){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); - } - //获取工作人员所属组织同级的党组织 - LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); - orgWrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); - orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); - orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); - return icPartyOrgDao.selectOne(orgWrapper); + return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index c88113ae6a..a02c753a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,6 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; @@ -150,4 +151,11 @@ public interface IcPartyMemberService extends BaseService { void execAsyncExcelImport(Path filePath, String importTaskId); IcPartyInfoResultDTO partyInfo(TokenDto tokenDto); + + /** + * 烟台管理平台党员画像，列表查询 + * @param formDTO + * @return + */ + PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); } 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 d9d43ea387..db0f496c26 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 @@ -32,6 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; @@ -734,5 +735,15 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { + // todo + return null; + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java index b2dbe3f596..93eea73c4e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java @@ -15,9 +15,20 @@ public class IcPartyMemberListFormDTO extends PageFormDTO implements Serializabl private static final long serialVersionUID = -6085134769034337175L; + /** + * 党组织id + */ private String orgId; private String code; private String agencyId; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 年龄：age + * 学历：education + * 如果不传默认查询所有党员 + */ + private String codeType; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java index a700a87a91..baf2e68550 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java @@ -14,7 +14,16 @@ public class PartyMemberAgeResultDTO implements Serializable { private static final long serialVersionUID = 3421162784157903637L; private String userId; private String name; + + private String age; + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了education + */ + private String education; + + private String mobile; private String icResiUser; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java index f686a1ce43..3df9d895ac 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java @@ -14,6 +14,13 @@ public class PartyMemberEducationResultDTO implements Serializable { private static final long serialVersionUID = -5042362121277863249L; private String userId; private String name; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了age + */ + private String age; + private String education; private String mobile; private String icResiUser; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java new file mode 100644 index 0000000000..6c55a6e8d0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 烟台管理平台党员画像 + * @Author yzm + * @Date 2023/4/20 13:32 + */ +@Data +public class PartymemberPortraitResultDTO { + private String userId; + private String name; + private String age; + private String education; + private String mobile; + private String icResiUser; +} + From a80f024c3fd2e1e96382470ce040740ca8543345 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:06:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=E8=BF=94=E5=8F=82dto?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E6=AD=A3=E5=B8=B8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/result}/PartymemberPortraitResultDTO.java | 2 +- .../modules/partymember/controller/IcPartyMemberController.java | 2 +- .../epmet/modules/partymember/service/IcPartyMemberService.java | 2 +- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename {epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi => epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result}/PartymemberPortraitResultDTO.java (84%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java similarity index 84% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java rename to epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index 6c55a6e8d0..b66a0adf0a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dto.result.resi; +package com.epmet.resi.partymember.dto.partymember.result; import lombok.Data; 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 1965fd546b..10c6f302f9 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 @@ -30,7 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index a02c753a8c..2fd029d03e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,7 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; 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 db0f496c26..296fbad057 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 @@ -32,7 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; From b9605d967d3eda9730634767d6af3875478ac66b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 15:52:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartymemberPortraitResultDTO.java | 24 +++- .../controller/IcPartyMemberController.java | 119 +++++++++++++++--- .../partymember/dao/IcPartyMemberDao.java | 5 +- .../service/IcPartyMemberService.java | 2 +- .../impl/IcPartyMemberServiceImpl.java | 64 +++++++--- .../mapper/partymember/IcPartyMemberDao.xml | 54 ++++++-- .../dto/result/PartyMemberAgeResultDTO.java | 1 + .../result/PartyMemberEducationResultDTO.java | 2 +- 8 files changed, 221 insertions(+), 50 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index b66a0adf0a..9989ef8f5e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.resi.partymember.dto.partymember.result; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -9,11 +12,30 @@ import lombok.Data; */ @Data public class PartymemberPortraitResultDTO { + @ExcelIgnore private String userId; + + @ColumnWidth(15) + @ExcelProperty(value = "姓名",order = 1) private String name; + + @ColumnWidth(20) + @ExcelProperty(value = "手机号",order = 2) + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 3) + private String idCard; + + @ColumnWidth(15) + @ExcelProperty(value = "年龄",order = 4) private String age; + + @ColumnWidth(15) + @ExcelProperty(value = "学历",order = 5) private String education; - private String mobile; + + @ExcelIgnore private String icResiUser; } 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 10c6f302f9..0330f3b9d3 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 @@ -30,7 +30,6 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; @@ -39,6 +38,7 @@ import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -57,10 +57,7 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -309,24 +306,116 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(icPartyMemberService.getPartyMemberEducationList(formDTO)); } + /** * 烟台党员画像列表接口，将上方两个接口，合为一个 - * @param tokenDto * @param formDTO * @return */ @PostMapping("partymember-portrait-list") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getOrgId())) { - // 当前工作人员所属组织下的，党组织 - IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == org) { - return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + public Result> queryPartyMemberPortraitList(@RequestBody IcPartyMemberListFormDTO formDTO) { + return new Result>().ok(icPartyMemberService.queryPartyMemberPortraitList(formDTO)); + } + + + /** + * 烟台党员画像列表-导出 + * @param formDTO + * @return + */ + @NoRepeatSubmit + @PostMapping("partymember-portrait-export") + public void partymemberPortraitExport(@RequestBody IcPartyMemberListFormDTO formDTO, HttpServletResponse response) throws Exception { + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setIsPage(true); + String fileName=getPartymemberPortraitFileName(formDTO.getCodeType(),formDTO.getCode()); + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartymemberPortraitResultDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyMemberService.queryPartyMemberPortraitList(formDTO); + list = data.getList(); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("党员画像列表导出exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + /** + * 烟台党员画像列表-导出 + * @return 返回导出excel的文件名 + */ + private String getPartymemberPortraitFileName(String codeType, String code) { + String name = "党员画像"; + if ("age".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "50岁以下党员信息"; + break; + case NumConstant.ONE_STR: + name = "50-59岁党员信息"; + break; + case NumConstant.TWO_STR: + name = "60-69岁党员信息"; + break; + case NumConstant.THREE_STR: + name = "70-79岁党员信息"; + break; + case NumConstant.FOUR_STR: + name = "80岁以上党员信息"; + break; + default: + name = ""; + break; + } + }else if ("education".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "小学及文盲党员信息"; + break; + case NumConstant.ONE_STR: + name = "初中学历党员信息"; + break; + case NumConstant.TWO_STR: + name = "高中学历党员信息"; + break; + case NumConstant.THREE_STR: + name = "大专学历党员信息"; + break; + case NumConstant.FOUR_STR: + name = "本科学历党员信息"; + break; + case NumConstant.FIVE_STR: + name = "硕士学历党员信息"; + break; + case NumConstant.SIX_STR: + name = "博士学历党员信息"; + break; + default: + name = "党员画像"; + break; } - formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); + String fileName=name+DateUtils.format(new Date()) + ".xlsx"; + return fileName; } 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 0f18a60ac5..740128a912 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 @@ -65,7 +65,10 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId, code] * @return java.util.List */ - List getPartyMemberEducationList(@Param("agencyId") String agencyId,@Param("orgId") String orgId,@Param("code") String code); + List getPartyMemberEducationList(@Param("agencyId") String agencyId, + @Param("orgId") String orgId, + @Param("code") String code, + @Param("codeType") String codeType); /** * @describe: 党员年龄范围统计 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 2fd029d03e..1ff8c2dece 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -157,5 +157,5 @@ public interface IcPartyMemberService extends BaseService { * @param formDTO * @return */ - PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); + PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO); } 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 296fbad057..07a405b0a4 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 @@ -451,7 +451,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); } List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); @@ -461,23 +461,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl getPartyMemberEducationList(IcPartyMemberListFormDTO formDTO) { if (formDTO.getIsPage()) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); PageInfo pageInfo = new PageInfo<>(list); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } - return new PageData<>(list, pageInfo.getTotal()); - } - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); + } + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); } @@ -742,8 +742,32 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { - // todo - return null; + public PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + if (null == org) { + return new PageData<>(Collections.emptyList(), 0, formDTO.getPageSize()); + } + formDTO.setOrgId(org.getId()); + } + if ("age".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); + + } + // else if ("education".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode(),formDTO.getCodeType()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); } + + } \ No newline at end of file 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 a9d4f8c583..962f962a8b 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 @@ -164,7 +164,9 @@ NAME, MOBILE, age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -172,14 +174,16 @@ NAME, MOBILE, age, - CASE + (CASE WHEN age < 50 THEN '0' WHEN age >= 50 AND age <= 59 THEN '1' WHEN age >= 60 AND age <= 69 THEN '2' WHEN age >= 70 AND age <= 79 THEN '3' ELSE '4' - END AS ageGroup, - IC_RESI_USER + END )AS ageGroup, + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -187,7 +191,20 @@ NAME, MOBILE, YEAR (FROM_DAYS(DATEDIFF(NOW(),SUBSTRING( ID_CARD, 7, 8 )))) AS age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + ( + case when CULTURE='0' then '小学及文盲' + when CULTURE='1' then '初中' + when CULTURE='2' then '高中' + when CULTURE='3' then '大专' + when CULTURE='4' then '本科' + when CULTURE='5' then '硕士' + when CULTURE='6' then '博士' + when CULTURE='7' then '中专' + else '' + end + )as education FROM ic_party_member WHERE @@ -205,22 +222,37 @@ WHERE ageGroup = #{code} - ORDER BY CONVERT(NAME USING GBK) ASC + ORDER BY ID ASC