diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java index 63114e5794..c55e61513e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -118,4 +118,20 @@ public class GridInfoCache implements Serializable { * 弃用标记 */ private Integer abandonFlag; + + /** + * 网格编码 + */ + private String code; + + /** + * 负责人姓名 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + } 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 50ecb715b2..cf933dd445 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 @@ -85,4 +85,12 @@ public interface IcHouseDao extends BaseDao { * @Description 【人房】房屋总数饼图 **/ List houseChart(@Param("orgId") String orgId, @Param("orgType") String orgType); + /** + * Desc: 根据楼栋ID修改房屋名 + * @param buildingId + * @author zxc + * @date 2022/4/26 13:49 + */ + void houseUpdateHouseName(@Param("buildingId")String buildingId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 679a194fcf..4e8ccd0e93 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -442,6 +442,9 @@ public class BuildingServiceImpl implements BuildingService { icBuildingDTO.setId(formDTO.getBuildingId()); icBuildingDTO.setCustomerId(customerId); icBuildingService.update(icBuildingDTO); + + // 更新房屋名称 + icHouseDao.houseUpdateHouseName(formDTO.getBuildingId()); //更新楼宇单元 //如果楼宇单元大于之前的楼宇单元,新增单元 Integer nowUnit = formDTO.getTotalUnitNum(); 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 efdce0c1ad..85cf756177 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 @@ -74,6 +74,54 @@ select concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName, c.NEIGHBOR_HOOD_NAME as neighborHoodName, + + + UPDATE ic_house h,ic_building b,ic_building_unit u + SET h.HOUSE_NAME = CONCAT(b.BUILDING_NAME,'-',u.UNIT_NAME,'-',h.DOOR_NAME), + h.UPDATED_TIME = NOW() + WHERE h.DEL_FLAG = '0' + AND h.BUILDING_ID = b.ID AND b.DEL_FLAG = '0' + AND h.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0' + AND h.BUILDING_ID = #{buildingId} + + + +