Browse Source

绑定联户入参调整

master
yinzuomei 2 years ago
parent
commit
eda679a8d9
  1. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  3. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  4. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

2
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<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList;
private List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseList;
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@ -188,7 +188,7 @@ public class IcHouseController {
@PostMapping("bingLianHu")
public Result bingLianHu( @RequestBody PartyCenterHouseBindLianHuFormDTO formDTO) {
if(StringUtils.isNotBlank(formDTO.getPartyCenterHouseId())){
icHouseService.bingLianHu(formDTO.getPartyCenterHouseId(),formDTO.getLianHuHouseIdList());
icHouseService.bingLianHu(formDTO.getPartyCenterHouseId(),formDTO.getLianHuHouseList());
}
return new Result();
}

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java

@ -155,9 +155,9 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
/**
* 灵山项目-党员中心户绑定联户
* @param partyCenterHouseId
* @param lianHuHouseIdList
* @param lianHuHouseList
*/
void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList);
void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseList);
/**
* 灵山项目-查询联户房屋列表

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@ -437,10 +437,10 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
* 灵山项目-党员中心户绑定联户
*
* @param partyCenterHouseId
* @param lianHuHouseIdList
* @param lianHuHouseList
*/
@Override
public void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList) {
public void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseList) {
IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId);
IcNeighborHoodEntity neighborHoodEntity=icNeighborHoodDao.selectById(partyCenterHouse.getNeighborHoodId());
CustomerGridDTO gridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(neighborHoodEntity.getGridId());
@ -451,17 +451,17 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId);
partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(partyCenterHouseId);
// 后插入
lianHuHouseIdList.forEach(lianHuHouseId->{
lianHuHouseList.forEach(lianHuHouse->{
//根据选中类型,查询下面的房屋
List<IcHouseEntity> list=new ArrayList<>();
if(!"house".equals(lianHuHouseId.getType())){
if(!"house".equals(lianHuHouse.getType())){
LambdaQueryWrapper<IcHouseEntity> 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());
query.eq("neighborHood".equals(lianHuHouse.getType()), IcHouseEntity::getNeighborHoodId, lianHuHouse.getId())
.eq("building".equals(lianHuHouse.getType()), IcHouseEntity::getBuildingId, lianHuHouse.getId())
.eq("unit".equals(lianHuHouse.getType()), IcHouseEntity::getBuildingUnitId, lianHuHouse.getId());
list.addAll(baseDao.selectList(query));
}else{
IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouseId.getId());
IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouse.getId());
list.add(icHouseEntity);
}
if(CollectionUtils.isNotEmpty(list)){

Loading…
Cancel
Save