Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

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;
+
 }

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

@@ -85,4 +85,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @Description 【人房】房屋总数饼图
      **/
     List<HouseChartResultDTO> 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);
+
 }

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();

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,
+    <!-- 根据楼栋ID修改房屋名 -->
+    <update id="houseUpdateHouseName">
+        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}
+    </update>
+
+    <!--<select id="searchHouseByPage" resultType="map">
+            select
+            a.ID as houseId,
+            a.HOUSE_NAME as houseName,
+            a.DOOR_NAME as doorName,
+            a.HOUSE_TYPE as houseType,
+            a.PURPOSE as purpose,
+            a.RENT_FLAG as rentFlag,
+            a.OWNER_NAME as ownerName,
+            a.OWNER_PHONE as ownerPhone,
+            a.OWNER_ID_CARD as ownerIdCard,
+            b.BUILDING_NAME as buildingName,
+            c.NEIGHBOR_HOOD_NAME as neighborHoodName,
+            d.UNIT_NUM as unitName
+            from ic_house a
+            INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+            and c.ID in (select e.ID from ic_building e ${ew1.customSqlSegment})
+            INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+            and c.ID in (select f.ID from ic_neighbor_hood f
+              INNER JOIN customer_agency g  on f.AGENCY_ID = g.ID
+              INNER JOIN customer_grid h  on f.GRID_ID = h.ID
+                ${ew2.customSqlSegment}
+            )
+            LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+            ${ew.customSqlSegment}
+    </select>-->
+    <!--<select id="searchHouseByPage" resultType="map">
+        select
+        a.ID as houseId,
+        a.HOUSE_NAME as houseName,
+        a.DOOR_NAME as doorName,
+        a.HOUSE_TYPE as houseType,
+        a.PURPOSE as purpose,
+        a.RENT_FLAG as rentFlag,
+        a.OWNER_NAME as ownerName,
+        a.OWNER_PHONE as ownerPhone,
+        a.OWNER_ID_CARD as ownerIdCard,
         b.BUILDING_NAME as buildingName,
         CONCAT(d.UNIT_NUM,'单元') as unitNum,
         a.DOOR_NAME as doorName,