elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

master
yinzuomei 2 years ago
parent
4c6c68ee89 c403082292
commit
3e96fbf248
2 changed files with 136 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 112
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  2. 42
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml

112
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
View File

@ -92,6 +92,8 @@ public class BuildingServiceImpl implements BuildingService {
private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao;
@Autowired
private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
@Autowired
private CommunityBuildingManagerDao communityBuildingManagerDao;
@Override
@ -103,8 +105,8 @@ public class BuildingServiceImpl implements BuildingService {
if (null != count && count > 0) {
throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
}
IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null);
IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), null);
if (null != count && count > 0) {
throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode());
}
@ -121,6 +123,57 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
icBuildingDao.insert(entity);
LambdaQueryWrapper<CommunityBuildingManagerEntity> manager = new LambdaQueryWrapper<CommunityBuildingManagerEntity>().eq(CommunityBuildingManagerEntity::getBuildingId,entity.getId());
CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager);
if (StringUtils.isNotBlank(entity.getBuildingLeaderType())&&
StringUtils.isNotBlank(entity.getBuildingLeaderIdCard())&&
StringUtils.isNotBlank(entity.getBuildingLeaderMobile())&&
StringUtils.isNotBlank(entity.getBuildingLeaderName())){
if (communityBuildingManagerEntity!=null){
communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard());
communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile());
communityBuildingManagerEntity.setType(entity.getBuildingLeaderType());
communityBuildingManagerEntity.setName(entity.getBuildingLeaderName());
communityBuildingManagerDao.updateById(communityBuildingManagerEntity);
}else{
communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard());
communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile());
communityBuildingManagerEntity.setType(entity.getBuildingLeaderType());
communityBuildingManagerEntity.setName(entity.getBuildingLeaderName());
communityBuildingManagerEntity.setBuildingId(entity.getId());
communityBuildingManagerEntity.setViliageId(entity.getNeighborHoodId());
IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(entity.getNeighborHoodId());
communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
agencyIds.add(neighborHood.getAgencyId());
LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
if (customerAgencyEntity.getLevel().equals("community")){
communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
}
if (customerAgencyEntity.getLevel().equals("street")){
communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
}
if (customerAgencyEntity.getLevel().equals("district")){
communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
}
}
communityBuildingManagerDao.insert(communityBuildingManagerEntity);
}
}else{
if (communityBuildingManagerEntity!=null){
communityBuildingManagerDao.deleteById(communityBuildingManagerEntity);
}
}
//设置楼宇单元
Integer totalUnitNum = formDTO.getTotalUnitNum();
List<IcBuildingUnitEntity> unitList = new ArrayList<>();
@ -657,8 +710,8 @@ public class BuildingServiceImpl implements BuildingService {
if (null != count && count > 0) {
throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
}
IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId());
IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId());
count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId());
if (null != count && count > 0) {
throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode());
}
@ -684,6 +737,57 @@ public class BuildingServiceImpl implements BuildingService {
icBuildingDTO.setCustomerId(customerId);
icBuildingService.update(icBuildingDTO);
LambdaQueryWrapper<CommunityBuildingManagerEntity> manager = new LambdaQueryWrapper<CommunityBuildingManagerEntity>().eq(CommunityBuildingManagerEntity::getBuildingId,icBuildingDTO.getId());
CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager);
if (StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderType())&&
StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderIdCard())&&
StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderMobile())&&
StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderName())){
if (communityBuildingManagerEntity!=null){
communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard());
communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile());
communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType());
communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName());
communityBuildingManagerDao.updateById(communityBuildingManagerEntity);
}else{
communityBuildingManagerEntity= new CommunityBuildingManagerEntity();
communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard());
communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile());
communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType());
communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName());
communityBuildingManagerEntity.setBuildingId(icBuildingDTO.getId());
communityBuildingManagerEntity.setViliageId(icBuildingDTO.getNeighborHoodId());
IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(icBuildingDTO.getNeighborHoodId());
communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
agencyIds.add(neighborHood.getAgencyId());
LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
if (customerAgencyEntity.getLevel().equals("community")){
communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId());
}
if (customerAgencyEntity.getLevel().equals("street")){
communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId());
}
if (customerAgencyEntity.getLevel().equals("district")){
communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId());
}
}
communityBuildingManagerDao.insert(communityBuildingManagerEntity);
}
}else{
if (communityBuildingManagerEntity!=null){
communityBuildingManagerDao.deleteById(communityBuildingManagerEntity);
}
}
// 更新房屋名称
icHouseDao.houseUpdateHouseName(formDTO.getBuildingId());
//更新楼宇单元

42
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
View File

@ -71,19 +71,33 @@
</select>
<select id="queryList" parameterType="map" resultType="com.epmet.dto.IcPropertyManagementDTO">
select m.*
from ic_property_management m
where m.del_flag='0'
and m.customer_id=#{customerId}
<if test="name != null and name != ''">
and m.name like concat('%',#{name},'%')
</if>
<if test="contactName != null and contactName != ''">
and m.CONTACT_NAME like concat('%',#{contactName},'%')
</if>
<if test="contactMobile != null and contactMobile != ''">
and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
</if>
order by m.CREATED_TIME desc
select * from (
select m.*,
(
SELECT
count(p.NEIGHBOR_HOOD_ID)
FROM
ic_neighbor_hood_property p
INNER JOIN ic_neighbor_hood h
ON ( p.NEIGHBOR_HOOD_ID = h.ID )
WHERE p.DEL_FLAG = '0'
and p.PROPERTY_ID =m.id
AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
AND h.DEL_FLAG = '0'
)as totalNeighborHood
from ic_property_management m
where m.del_flag='0'
and m.customer_id=#{customerId}
<if test="name != null and name != ''">
and m.name like concat('%',#{name},'%')
</if>
<if test="contactName != null and contactName != ''">
and m.CONTACT_NAME like concat('%',#{contactName},'%')
</if>
<if test="contactMobile != null and contactMobile != ''">
and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
</if>
)t
order by t.totalNeighborHood desc,t.CREATED_TIME desc
</select>
</mapper>
Write Preview
Loading…
Cancel
Save