From 8c0de433b5206a83362a89d741be64c685b7d3fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 09:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E6=88=B7=E7=BB=91=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=BB=E6=84=8F=E5=8B=BE=E9=80=89=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?/=E6=A5=BC=E6=A0=8B/=E5=8D=95=E5=85=83/=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyCenterHouseBindLianHuDetailDTO.java | 8 ++-- .../PartyCenterHouseBindLianHuFormDTO.java | 2 +- .../LingshanPartyCenterHouseLianhuDao.java | 2 + .../com/epmet/service/IcHouseService.java | 3 +- .../service/impl/IcHouseServiceImpl.java | 48 +++++++++++++------ .../LingshanPartyCenterHouseLianhuDao.xml | 3 ++ 6 files changed, 45 insertions(+), 21 deletions(-) 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 index 378f8fb9d9..b9e06dce3c 100644 --- 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 @@ -18,10 +18,10 @@ public class PartyCenterHouseBindLianHuDetailDTO { private String id; /** - * 小区： - * 楼栋： - * 单元： - * 房屋 + * 小区：neighborHood + * 楼栋：building + * 单元：unit + * 房屋:house */ private String type; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java index ae1737f3ef..5f532f0cf2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java @@ -12,6 +12,6 @@ import java.util.List; @Data public class PartyCenterHouseBindLianHuFormDTO { private String partyCenterHouseId; - private List lianHuHouseIdList; + private List lianHuHouseIdList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java index 7fb9c42711..0750103ca0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java @@ -21,4 +21,6 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao queryLianHuHouseId(String partyCenterHouseId); + + int deleteByPartyCenterHouseId(String partyCenterHouseId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 29a7712d8c..d77a7a0eab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -14,6 +14,7 @@ import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.IcHouseEntity; @@ -155,7 +156,7 @@ public interface IcHouseService extends BaseService { * @param partyCenterHouseId * @param lianHuHouseIdList */ - void bingLianHu(String partyCenterHouseId, List lianHuHouseIdList); + void bingLianHu(String partyCenterHouseId, List lianHuHouseIdList); /** * 灵山项目-查询联户房屋列表 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 7e4559b072..724190b047 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 @@ -25,6 +25,7 @@ import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.*; import com.epmet.enums.HousePurposeEnums; @@ -438,29 +439,46 @@ public class IcHouseServiceImpl extends BaseServiceImpl lianHuHouseIdList) { + public void bingLianHu(String partyCenterHouseId, List lianHuHouseIdList) { IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId); IcNeighborHoodEntity neighborHoodEntity=icNeighborHoodDao.selectById(partyCenterHouse.getNeighborHoodId()); CustomerGridDTO gridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(neighborHoodEntity.getGridId()); + String gridIdPath=PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()); + // 先删除 LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId); - partyCenterHouseLianhuDao.delete(queryWrapper); + partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(partyCenterHouseId); // 后插入 lianHuHouseIdList.forEach(lianHuHouseId->{ - IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouseId); - if(null!=icHouseEntity){ - LingshanPartyCenterHouseLianhuEntity entity=new LingshanPartyCenterHouseLianhuEntity(); - entity.setCustomerId(neighborHoodEntity.getCustomerId()); - entity.setPartyCenterHouseId(partyCenterHouseId); - entity.setAgencyId(neighborHoodEntity.getAgencyId()); - entity.setGridId(neighborHoodEntity.getGridId()); - entity.setGridIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids())); - entity.setNeighborHoodId(icHouseEntity.getNeighborHoodId()); - entity.setBuildingId(icHouseEntity.getBuildingId()); - entity.setBuildingUnitId(icHouseEntity.getBuildingUnitId()); - entity.setHouseId(lianHuHouseId); - partyCenterHouseLianhuDao.insert(entity); + //根据选中类型，查询下面的房屋 + List list=new ArrayList<>(); + if(!"house".equals(lianHuHouseId.getType())){ + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq("neighborHood".equals(lianHuHouseId.getType()), IcHouseEntity::getNeighborHoodId, lianHuHouseId.getId()) + .eq("building".equals(lianHuHouseId.getType()), IcHouseEntity::getBuildingId, lianHuHouseId.getId()) + .eq("unit".equals(lianHuHouseId.getType()), IcHouseEntity::getBuildingUnitId, lianHuHouseId.getId()); + list.addAll(baseDao.selectList(query)); + }else{ + IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouseId.getId()); + list.add(icHouseEntity); + } + if(CollectionUtils.isNotEmpty(list)){ + for(IcHouseEntity houseEntity:list){ + LingshanPartyCenterHouseLianhuEntity entity=new LingshanPartyCenterHouseLianhuEntity(); + entity.setPartyCenterHouseId(partyCenterHouseId); + //目前只能绑定同一个网格下的房屋 + entity.setCustomerId(neighborHoodEntity.getCustomerId()); + entity.setAgencyId(neighborHoodEntity.getAgencyId()); + entity.setGridId(neighborHoodEntity.getGridId()); + entity.setGridIdPath(gridIdPath); + + entity.setNeighborHoodId(houseEntity.getNeighborHoodId()); + entity.setBuildingId(houseEntity.getBuildingId()); + entity.setBuildingUnitId(houseEntity.getBuildingUnitId()); + entity.setHouseId(houseEntity.getId()); + partyCenterHouseLianhuDao.insert(entity); + } } }); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml index dec2563774..663d63ab6c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml @@ -33,4 +33,7 @@ AND h.PARTY_CENTER_HOUSE_ID = #{partyCenterHouseId} + + delete from lingshan_party_center_house_lianhu where PARTY_CENTER_HOUSE_ID=#{partyCenterHouseId} + \ No newline at end of file