Browse Source

Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

master
wxz 2 years ago
parent
commit
91e9af9228
  1. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java
  2. 27
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java
  3. 17
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java
  4. 86
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java
  5. 46
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  6. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
  7. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java
  8. 66
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/LingshanPartyCenterHouseLianhuEntity.java
  9. 28
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  10. 100
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  11. 51
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  12. 36
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@ -563,7 +563,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
return cateogries.stream().map(c -> { return cateogries.stream().map(c -> {
LingshanAgentServiceRecordEntity data = categoryAndData.get(c.getId()); LingshanAgentServiceRecordEntity data = categoryAndData.get(c.getId());
return new ScreenAgentServiceCategoryAnalysisRstDTO(c.getCategoryName(), data.getQty()); return new ScreenAgentServiceCategoryAnalysisRstDTO(c.getCategoryName(), data == null ? 0 : data.getQty());
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }

27
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form.lingshan;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/16 17:50
*/
@Data
public class PartyCenterHousePageFormDTO extends PageFormDTO {
/**
* 所属小区
*/
private String neighborHoodName;
/**
* 所属楼栋
*/
private String buildingName;
//tokenDto.
private String customerId;
//tokenDto.
private String staffId;
}

17
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuFormDTO.java

@ -0,0 +1,17 @@
package com.epmet.dto.result.lingshan;
import lombok.Data;
import java.util.List;
/**
* @Description 灵山需求绑定联户入参DTO
* @Author yzm
* @Date 2023/5/16 18:27
*/
@Data
public class PartyCenterHouseBindLianHuFormDTO {
private String partyCenterHouseId;
private List<String> lianHuHouseIdList;
}

86
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java

@ -0,0 +1,86 @@
package com.epmet.dto.result.lingshan;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/16 17:51
*/
@Data
public class PartyCenterHouseResultDTO {
private String partyCenterHouseId;
private String houseName;
/**
* 门牌号
*/
private String doorName;
/**
* 所属楼栋id
*/
private String buildingId;
private String buildingName;
/**
* 所属单元id
*/
private String buildingUnitId;
private String unitName;
/**
* 所属小区
*/
private String neighborHoodId;
private String neighborHoodName;
/**
* 所属网格
*/
private String gridId;
private String gridName;
/**
* 所属组织
*/
private String agencyId;
private String agencyName;
/**
* 房屋类型
*/
private String houseType;
private String houseTypeName;
/**
* 房屋用途
*/
private String purpose;
private String purposeName;
/**
* 是否出租
* 房屋状态:1出租 0自住 2闲置 3未售出
*/
private Integer rentFlag;
private String houseStatusName;
/**
* 房主姓名
*/
private String ownerName;
/**
* 房主电话
*/
private String ownerPhone;
/**
* 房主身份证
*/
private String ownerIdCard;
private String remark;
/**
* 联户数
*/
private Integer totalLianHu;
}

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

@ -21,17 +21,22 @@ import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.MaskResponse;
import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.form.PageFormDTO;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseAgencyInfoResultDTO;
import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HouseListResultDTO;
import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.dto.result.HousesNameResultDTO;
import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuFormDTO;
import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.epmet.service.IcHouseService; import com.epmet.service.IcHouseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -161,4 +166,45 @@ public class IcHouseController {
return icHouseService.checkHomeInfo(formDTO); return icHouseService.checkHomeInfo(formDTO);
} }
/**
* 灵山项目-联户绑定
* 该接口返回党员中心户房屋列表默认登录用户查询本组织及下级
*
* @param formDTO
* @return
*/
@PostMapping("party-center-house-list")
public Result<PageData<PartyCenterHouseResultDTO>> queryPartyCenterHouseList(@LoginUser TokenDto tokenDto, @RequestBody PartyCenterHousePageFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
return new Result<PageData<PartyCenterHouseResultDTO>>().ok(icHouseService.queryPartyCenterHouseList(formDTO));
}
/**
* 灵山项目-党员中心户绑定联户
* @param formDTO
* @return
*/
@PostMapping("bingLianHu")
public Result bingLianHu( @RequestBody PartyCenterHouseBindLianHuFormDTO formDTO) {
if(StringUtils.isNotBlank(formDTO.getPartyCenterHouseId())){
icHouseService.bingLianHu(formDTO.getPartyCenterHouseId(),formDTO.getLianHuHouseIdList());
}
return new Result();
}
/**
* 灵山项目-查询联户房屋列表
*
* @param partyCenterHouseId
* @return
*/
@PostMapping("queryLianHuHouseId/{partyCenterHouseId}")
public Result<List<String>> queryLianHuHouseId(@PathVariable("partyCenterHouseId") String partyCenterHouseId) {
List<String> list = icHouseService.queryLianHuHouseId(partyCenterHouseId);
return new Result<List<String>>().ok(list);
}
} }

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@ -7,6 +7,7 @@ import com.epmet.dto.form.GetHouseInfoToCollectFormDTO;
import com.epmet.dto.form.HouseChartFormDTO; import com.epmet.dto.form.HouseChartFormDTO;
import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcHouseListFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.epmet.entity.CustomerOrgParameterEntity; import com.epmet.entity.CustomerOrgParameterEntity;
import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcHouseEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -213,4 +214,19 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
List<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO); List<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
List<IcHouseEntity> selectListForRenFangStats(@Param("buildingId") String buildingId); List<IcHouseEntity> selectListForRenFangStats(@Param("buildingId") String buildingId);
/**
* 灵山项目-联户绑定
* 该接口返回党员中心户房屋列表默认登录用户查询本组织及下级
*
* @param customerId
* @param agencyId
* @param neighborHoodName
* @param buildingName
* @return
*/
List<PartyCenterHouseResultDTO> selectListPartyCenterHouse(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("neighborHoodName") String neighborHoodName,
@Param("buildingName") String buildingName);
} }

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java

@ -0,0 +1,24 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 灵山_党员中心户联户
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Mapper
public interface LingshanPartyCenterHouseLianhuDao extends BaseDao<LingshanPartyCenterHouseLianhuEntity> {
/**
* 查询党员中心对应的联户房屋id
* @param partyCenterHouseId
* @return
*/
List<String> queryLianHuHouseId(String partyCenterHouseId);
}

66
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/LingshanPartyCenterHouseLianhuEntity.java

@ -0,0 +1,66 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 灵山_党员中心户联户
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("lingshan_party_center_house_lianhu")
public class LingshanPartyCenterHouseLianhuEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 党员中心户房屋idlingshan_party_center_house.HOUSE_ID
*/
private String partyCenterHouseId;
/**
* 联户房屋所属组织id
*/
private String agencyId;
/**
* 联户房屋所属网格id
*/
private String gridId;
/**
* 联户grid_id的path包含grid_id
*/
private String gridIdPath;
/**
* 联户小区id
*/
private String neighborHoodId;
/**
* 联户楼栋id
*/
private String buildingId;
/**
* 联户单元id
*/
private String buildingUnitId;
/**
* 联户联户房屋id
*/
private String houseId;
}

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

@ -2,14 +2,19 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.DetailByTypeFormDTO;
import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
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.PartyCenterHouseResultDTO;
import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcHouseEntity;
import java.util.List; import java.util.List;
@ -138,5 +143,24 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
*/ */
Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); Result checkHomeInfo(CheckHouseInfoFormDTO formDTO);
/**
* 灵山项目-联户绑定
* 该接口返回党员中心户房屋列表默认登录用户查询本组织及下级
* @return
*/
PageData<PartyCenterHouseResultDTO> queryPartyCenterHouseList(PartyCenterHousePageFormDTO formDTO);
/**
* 灵山项目-党员中心户绑定联户
* @param partyCenterHouseId
* @param lianHuHouseIdList
*/
void bingLianHu(String partyCenterHouseId, List<String> lianHuHouseIdList);
/**
* 灵山项目-查询联户房屋列表
* @param partyCenterHouseId
* @return
*/
List<String> queryLianHuHouseId(String partyCenterHouseId);
} }

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

@ -5,30 +5,28 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.PidUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcBuildingDao; import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dao.*;
import com.epmet.dao.IcHouseDao; import com.epmet.dto.*;
import com.epmet.dao.IcNeighborHoodDao;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.IcResiCategoryStatsConfigDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.entity.IcBuildingEntity; import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.entity.*;
import com.epmet.entity.IcHouseEntity;
import com.epmet.entity.IcNeighborHoodEntity;
import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HousePurposeEnums;
import com.epmet.enums.HouseRentFlagEnums; import com.epmet.enums.HouseRentFlagEnums;
import com.epmet.enums.HouseTypeEnums; import com.epmet.enums.HouseTypeEnums;
@ -36,7 +34,10 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient;
import com.epmet.redis.IcHouseRedis; import com.epmet.redis.IcHouseRedis;
import com.epmet.service.CustomerGridService;
import com.epmet.service.IcHouseService; import com.epmet.service.IcHouseService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -73,6 +74,9 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
private IcBuildingUnitDao buildingUnitDao; private IcBuildingUnitDao buildingUnitDao;
@Autowired @Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
@Autowired
private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao;
@Override @Override
public IcHouseDTO get(String id) { public IcHouseDTO get(String id) {
@ -405,4 +409,76 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo); return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
} }
/**
* 灵山项目-联户绑定
* 该接口返回党员中心户房屋列表默认登录用户查询本组织及下级
*
* @return
*/
@Override
public PageData<PartyCenterHouseResultDTO> queryPartyCenterHouseList(PartyCenterHousePageFormDTO formDTO) {
CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<PartyCenterHouseResultDTO> list=baseDao.selectListPartyCenterHouse(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId(),
formDTO.getNeighborHoodName(),formDTO.getBuildingName());
list.forEach(item -> {
item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType()));
item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose()));
});
PageInfo<PartyCenterHouseResultDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize());
}
/**
* 灵山项目-党员中心户绑定联户
*
* @param partyCenterHouseId
* @param lianHuHouseIdList
*/
@Override
public void bingLianHu(String partyCenterHouseId, List<String> lianHuHouseIdList) {
IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId);
IcNeighborHoodEntity neighborHoodEntity=icNeighborHoodDao.selectById(partyCenterHouse.getNeighborHoodId());
CustomerGridDTO gridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(neighborHoodEntity.getGridId());
// 先删除
LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> queryWrapper=new LambdaQueryWrapper<>();
queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId);
partyCenterHouseLianhuDao.delete(queryWrapper);
// 后插入
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);
}
});
}
/**
* 灵山项目-查询联户房屋列表
*
* @param partyCenterHouseId
* @return
*/
@Override
public List<String> queryLianHuHouseId(String partyCenterHouseId) {
if(StringUtils.isBlank(partyCenterHouseId)){
return new ArrayList<>();
}
return partyCenterHouseLianhuDao.queryLianHuHouseId(partyCenterHouseId);
}
} }

51
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@ -701,4 +701,55 @@
CAST(a.DOOR_NAME AS SIGNED), CAST(a.DOOR_NAME AS SIGNED),
CONVERT(a.DOOR_NAME using gbk) CONVERT(a.DOOR_NAME using gbk)
</select> </select>
<!-- 灵山项目-联户绑定 该接口返回:党员中心户房屋列表;默认登录用户查询本组织及下级 -->
<select id="selectListPartyCenterHouse" parameterType="map" resultType="com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO">
SELECT
ih.ID as partyCenterHouseId,
concat(h.NEIGHBOR_HOOD_NAME,b.BUILDING_NAME,u.UNIT_NAME,ih.DOOR_NAME)as houseName,
ih.DOOR_NAME as doorName,
ih.BUILDING_UNIT_ID as buildingUnitId,
u.UNIT_NAME as unitName,
ih.BUILDING_ID as buildingId,
b.BUILDING_NAME as buildingName,
ih.NEIGHBOR_HOOD_ID as neighborHoodId,
h.NEIGHBOR_HOOD_NAME as neighborHoodName,
h.GRID_ID as gridId,
cg.GRID_NAME as gridName,
h.AGENCY_ID as agencyId,
ca.ORGANIZATION_NAME as agencyName,
ih.HOUSE_TYPE houseType,
ih.PURPOSE,
ih.RENT_FLAG,
ih.OWNER_NAME,
ih.OWNER_PHONE,
ih.OWNER_ID_CARD,
ih.REMARK,
(select count(r.ID)
from lingshan_lianhu_house_rel 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)
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},'%') )
<if test="neighborHoodName != null and neighborHoodName.trim() != ''">
and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
</if>
<if test="buildingName != null and buildingName.trim() != ''">
and b.BUILDING_NAME like concat('%',#{buildingName},'%')
</if>
order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc
</select>
</mapper> </mapper>

36
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.LingshanPartyCenterHouseLianhuDao">
<resultMap type="com.epmet.entity.LingshanPartyCenterHouseLianhuEntity" id="lingshanPartyCenterHouseLianhuMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="partyCenterHouseId" column="PARTY_CENTER_HOUSE_ID"/>
<result property="agencyId" column="AGENCY_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="gridIdPath" column="GRID_ID_PATH"/>
<result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
<result property="buildingId" column="BUILDING_ID"/>
<result property="buildingUnitId" column="BUILDING_UNIT_ID"/>
<result property="houseId" column="HOUSE_ID"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<!-- 查询党员中心对应的联户房屋id -->
<select id="queryLianHuHouseId" parameterType="java.lang.String" resultType="java.lang.String">
SELECT
distinct h.HOUSE_ID
FROM
lingshan_party_center_house_lianhu h
WHERE
h.DEL_FLAG = '0'
AND h.PARTY_CENTER_HOUSE_ID = #{partyCenterHouseId}
</select>
</mapper>
Loading…
Cancel
Save