From 4497b26210d3e800927083976fad59db55109cc7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 16 May 2023 20:40:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingshan/PartyCenterHousePageFormDTO.java | 13 +++++++ .../PartyCenterHouseBindLianHuDetailDTO.java | 28 +++++++++++++++ .../lingshan/PartyCenterHouseResultDTO.java | 12 +++++++ .../epmet/controller/IcHouseController.java | 1 + .../main/java/com/epmet/dao/IcHouseDao.java | 4 ++- .../service/impl/IcHouseServiceImpl.java | 2 +- .../src/main/resources/mapper/IcHouseDao.xml | 34 ++++++++++++++----- 7 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java index 267b23e03f..7bdd159105 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java @@ -19,9 +19,22 @@ public class PartyCenterHousePageFormDTO extends PageFormDTO { */ private String buildingName; + /** + * pc端默认传1 + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; + + /** + * 所属楼栋id + * 大屏用 + */ + private String buildingId; + //tokenDto. private String customerId; //tokenDto. private String staffId; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java new file mode 100644 index 0000000000..378f8fb9d9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description 绑定联户入参明细 + * @Author yzm + * @Date 2023/5/16 20:16 + */ +@Data +public class PartyCenterHouseBindLianHuDetailDTO { + /** + * 小区id + * 楼栋id + * 单元id + * 房屋id + */ + private String id; + + /** + * 小区： + * 楼栋： + * 单元： + * 房屋 + */ + private String type; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java index d42084013a..e649184ce0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java @@ -13,6 +13,7 @@ public class PartyCenterHouseResultDTO { private String houseName; /** * 门牌号 + * 房号 */ private String doorName; @@ -26,6 +27,9 @@ public class PartyCenterHouseResultDTO { * 所属单元id */ private String buildingUnitId; + /** + *单元号 + */ private String unitName; /** @@ -71,10 +75,18 @@ public class PartyCenterHouseResultDTO { * 房主电话 */ private String ownerPhone; + /** + * 加密房主电话 + */ + private String showOwnerPhone; /** * 房主身份证 */ private String ownerIdCard; + /** + * 加密房主身份证 + */ + private String showOwnerIdCard; private String remark; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 2eb3a2c5bc..27ca372d06 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -173,6 +173,7 @@ public class IcHouseController { * @param formDTO * @return */ + @MaskResponse(fieldNames = { "showOwnerPhone", "showOwnerIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("party-center-house-list") public Result> queryPartyCenterHouseList(@LoginUser TokenDto tokenDto, @RequestBody PartyCenterHousePageFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 70bbd77c9c..f4212b5487 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -228,5 +228,7 @@ public interface IcHouseDao extends BaseDao { List selectListPartyCenterHouse(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("neighborHoodName") String neighborHoodName, - @Param("buildingName") String buildingName); + @Param("buildingName") String buildingName, + @Param("buildingId") String buildingId, + @Param("partyCenterHouseFlag") String partyCenterHouseFlag); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 52473f17ba..7e4559b072 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -422,7 +422,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl list=baseDao.selectListPartyCenterHouse(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId(), - formDTO.getNeighborHoodName(),formDTO.getBuildingName()); + formDTO.getNeighborHoodName(),formDTO.getBuildingName(),formDTO.getBuildingId(),formDTO.getPartyCenterHouseFlag()); list.forEach(item -> { item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType())); item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 26cd9e0382..1ccf5a4d65 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -721,35 +721,51 @@ ih.HOUSE_TYPE houseType, ih.PURPOSE, ih.RENT_FLAG, + (case when ih.RENT_FLAG = '0' then '自住' + when ih.RENT_FLAG = '1' then '出租' + when ih.RENT_FLAG = '2' then '闲置' + when ih.RENT_FLAG = '3' then '未出售' + else '' end) as houseStatusName, ih.OWNER_NAME, ih.OWNER_PHONE, + ih.OWNER_PHONE as showOwnerPhone, ih.OWNER_ID_CARD, + ih.OWNER_ID_CARD as showOwnerIdCard, ih.REMARK, (select count(r.ID) - from lingshan_lianhu_house_rel r + from lingshan_party_center_house_lianhu r where r.PARTY_CENTER_HOUSE_ID=ih.ID and r.DEL_FLAG='0' )as totalLianHu FROM ic_house ih - inner join ic_building_unit u - on(ih.BUILDING_UNIT_ID=u.ID) - INNER JOIN ic_building b ON ( ih.BUILDING_ID = b.ID ) - INNER JOIN ic_neighbor_hood h ON ( b.NEIGHBOR_HOOD_ID = h.ID ) - left join customer_grid cg on(h.GRID_ID=cg.ID) - left join customer_agency ca on(h.AGENCY_ID=ca.ID) + inner join ic_building_unit u + on(ih.BUILDING_UNIT_ID=u.ID) + INNER JOIN ic_building b ON ( ih.BUILDING_ID = b.ID ) + INNER JOIN ic_neighbor_hood h ON ( b.NEIGHBOR_HOOD_ID = h.ID ) + left join customer_grid cg on(h.GRID_ID=cg.ID) + left join customer_agency ca on(h.AGENCY_ID=ca.ID) WHERE ih.DEL_FLAG = '0' AND b.DEL_FLAG = '0' AND h.DEL_FLAG = '0' - AND ih.PARTY_CENTER_HOUSE_FLAG='1' - AND (h.AGENCY_ID=#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) + + AND ih.PARTY_CENTER_HOUSE_FLAG='1' + and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%') and b.BUILDING_NAME like concat('%',#{buildingName},'%') + + and b.id = #{buildingId} + + + + AND (h.AGENCY_ID=#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) + + order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc From 79167af633dd0250ccd2827f3b4ccfa98c6b6d53 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 16 May 2023 21:23:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86?= =?UTF-8?q?=EF=BC=9A=E5=A4=A7=E5=B1=8F=E4=B8=AD=E5=A4=AE=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AF=B9=E8=B1=A1=E7=9B=AE=E5=BD=95=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 +- .../epmet/service/impl/IcPartyServiceCenterServiceImpl.java | 2 +- .../partyOrg/service/impl/LingShanPartyOrgServiceImpl.java | 4 ++-- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 6674005ab3..a70be9590d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -729,7 +729,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl q = new LambdaQueryWrapper<>(); - q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.eq(IcPartyUnitEntity::getPids, orgIdPath))); + q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.likeRight(IcPartyUnitEntity::getPids, orgIdPath))); return baseDao.selectCount(q); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index d7ecec82cc..f0aa18203f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -767,7 +767,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl q = new QueryWrapper().select(" org_type, count(*) qtyOfType") .lambda() - .and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.eq(IcPartyServiceCenterEntity::getPids, orgIdPath))) + .and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.likeRight(IcPartyServiceCenterEntity::getPids, orgIdPath))) .groupBy(IcPartyServiceCenterEntity::getOrgType); List l = icPartyServiceCenterDao.selectList(q); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java index d869e728cf..105ba5c1d6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java @@ -66,7 +66,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res // 街道及以上级别，用pids，因为要从社区开始查，本级及下级 q = new QueryWrapper().select(" party_org_type, count(*) childrenQty").lambda() // 本组织下级的所有子级,不含本级 - .like(IcPartyOrgEntity::getAgencyPids, orgIdPath) + .likeRight(IcPartyOrgEntity::getAgencyPids, orgIdPath) .groupBy(IcPartyOrgEntity::getPartyOrgType); } @@ -168,7 +168,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res } /** - * @Description: 查询支部。支部是直属的 + * @Description: 查询支部。支部是直属的!!!!!!!!!!!!!!!!!!!!!!!!!!! * @param orgId: * @param orgType: * @Return java.util.List diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index d2592642d3..d81f18e48b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -314,9 +314,9 @@ from ic_party_org o left join ic_party_member m on (o.ID = m.SSZB and m.DEL_FLAG = 0) where o.DEL_FLAG = 0 - and o.AGENCY_ID = #{orgId} + and o.AGENCY_PIDS like #{orgId} and o.PARTY_ORG_TYPE = 5 group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE - + \ No newline at end of file