From 0ade16d68991cafdb5dc701d377ecbeab634e87c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 27 May 2022 14:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=8F=AA=E8=83=BD=E5=BB=BA?= =?UTF-8?q?=E5=9C=A8=E6=94=AF=E9=83=A8=E4=B8=8A=EF=BC=8C=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E6=8A=BD=E5=8F=96=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyMemberServiceImpl.java | 12 ++++ .../mapper/partymember/IcPartyMemberDao.xml | 12 +--- .../com/epmet/dto/IcVolunteerPolyDTO.java | 2 + .../controller/IcResiUserController.java | 6 +- .../service/impl/IcResiUserServiceImpl.java | 36 +++++++++- .../impl/IcVolunteerPolyServiceImpl.java | 71 +++++++++++++------ .../main/resources/mapper/IcResiUserDao.xml | 34 ++++++++- 7 files changed, 136 insertions(+), 37 deletions(-) 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 b5e668dca6..8b10f6308d 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 @@ -222,6 +222,12 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO) { - return new Result().ok(icResiUserService.icPartyMemberSync(formDTO)); + IcPartyMemberDTO dto = icResiUserService.icPartyMemberSync(formDTO); + if (StringUtils.isNotBlank(dto.getIcResiUser())) { + this.sendVolunteerMsg(formDTO.getCustomerId(), dto.getIcResiUser()); + } + return new Result().ok(dto); } /** 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 38cee7cf0c..e443b43e01 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 @@ -205,6 +205,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + boolean isDyzxh = false; + //判断是否是党员中心户 + if (formMap.containsKey("ic_party_member")) { + for (LinkedHashMap hash : formMap.get("ic_party_member")) { + if (NumConstant.ONE_STR.equals(hash.get("IS_DYZXH"))) { + isDyzxh = true; + } + } + } for (IcResiUserFormDTO d : formDTO) { if ("ic_resi_user".equals(d.getTableName())) { map = d.getList().get(0); @@ -248,6 +258,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl%s", agencyId)); } + if (isDyzxh) { + map.put("IS_VOLUNTEER", NumConstant.ONE_STR); + } //新增主表数据 baseDao.add(d.getTableName(), map); @@ -302,7 +315,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : d.getList()) { - partyMemberDTO.setVolunteerCategory(hash.get("VOLUNTEER_CATEGORY")); + partyMemberDTO.setVolunteerCategory(hash.get("VOLUNTEER_CATEGORY")); } } //2022.05.18 end zhaoqf @@ -402,6 +415,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + boolean isDyzxh = false; + //判断是否是党员中心户 + if (formMap.containsKey("ic_party_member")) { + for (LinkedHashMap hash : formMap.get("ic_party_member")) { + if (NumConstant.ONE_STR.equals(hash.get("IS_DYZXH"))) { + isDyzxh = true; + } + } + } for (IcResiUserFormDTO d : formDTO) { if ("ic_resi_user".equals(d.getTableName())) { map = d.getList().get(0); @@ -497,6 +520,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl NumConstant.ONE) { + if (isDyzxh) { + map.put("IS_VOLUNTEER", NumConstant.ONE_STR); + } map.put("updated_by", tokenDto.getUserId()); baseDao.upTable("ic_resi_user", resiUserId, map); } @@ -2073,6 +2099,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl page(Map params) { @@ -202,10 +199,14 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl appVolunteerList = result.getData(); + appVolunteerList.forEach(item -> { + if(NumConstant.ONE_STR.equals(item.getIsParty()) && (NumConstant.ONE_STR.equals(item.getIsDyzxh()))) { + item.setVolunteerCategory(item.getVolunteerCategory().concat(",dangyuanzhongxinhu")); + } + }); if (CollectionUtils.isNotEmpty(appVolunteerList)) { //获取居民信息 List userIds = appVolunteerList.stream().map(IcVolunteerPolyDTO::getUserId).collect(Collectors.toList()); - //根据志愿者的userId获取居民信息并转成map List userList = new ArrayList<>(); List> partition = ListUtils.partition(userIds, NumConstant.FIFTY); @@ -301,6 +302,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl volunteerList = icResiUserDao.getVolunteerList(customerId, userId); @@ -312,6 +314,15 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl memberWrapper = new LambdaUpdateWrapper<>(); + memberWrapper.eq(IcPartyMemberEntity::getIcResiUser, icUser.getId()); + IcPartyMemberEntity memberEntity = icPartyMemberDao.selectOne(memberWrapper); + if (null != memberEntity && NumConstant.ONE_STR.equals(memberEntity.getIsDyzxh())) { + isDyzxh = true; + } + } //判断是否是志愿者 if (NumConstant.ONE_STR.equals(icUser.getIsVolunteer())) { if (CollectionUtils.isNotEmpty(volunteerList)) { @@ -325,6 +336,9 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl categoryList = Arrays.asList(volunteerList.get(NumConstant.ZERO).getVolunteerCategory().split(StrConstant.COMMA)); + if (isDyzxh) { + categoryList.add("dangyuanzhongxinhu"); + } List entityList = categoryList.stream().map(o -> { IcVolunteerPolyCategoryEntity category = new IcVolunteerPolyCategoryEntity(); category.setCustomerId(entity.getCustomerId()); @@ -340,9 +354,31 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl AND a.ID = #{userId} + UNION ALL + SELECT + a.ID AS icResiUser, + a.CUSTOMER_ID, + a.AGENCY_ID, + a.PIDS AS agencyPids, + `NAME`, + ID_CARD, + MOBILE, + GENDER, + IS_PARTY, + 'dangyuanzhongxinhu' AS VOLUNTEER_CATEGORY, + IFNULL( IS_DYZXH, "0" ) AS IS_DYZXH + FROM + ic_resi_user a + INNER JOIN ic_party_member c ON a.ID = c.IC_RESI_USER + AND c.DEL_FLAG = '0' + WHERE + a.DEL_FLAG = '0' + AND a.IS_VOLUNTEER != '1' + AND a.IS_PARTY = '1' + AND a.CUSTOMER_ID = #{customerId} + AND c.IS_DYZXH = '1' + + AND a.ID = #{userId} +