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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmetuser.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 居民信息分页查询表单返参
@@ -160,7 +159,9 @@ public class IcResiUserPageResultDTO implements Serializable {
      */
     private Boolean isSpecial;
 
-    private List<String> demandCategoryIds;
+
+    // 以下属性都需要单独处理，不是直接取数据库的字段
+    private String demandCategoryIds;
 
     private String demandName;
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java

@@ -54,7 +54,7 @@ public class HouseInfoDTO implements Serializable {
     private String doorName;
 
     /**
-     * 房屋类型，这里存储字典value就可以
+     * 房屋类型，1楼房，2平房，3别墅
      */
     private String houseType;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java

@@ -102,6 +102,7 @@ public class IcResiUserServiceImpl implements IcResiUserService {
                 resultDTO.setVallageName(houseInfoMap.get(resultDTO.getHomeId()).getNeighborHoodName());
                 resultDTO.setUnitName(houseInfoMap.get(resultDTO.getHomeId()).getUnitName());
                 resultDTO.setHomeName(houseInfoMap.get(resultDTO.getHomeId()).getDoorName());
+                resultDTO.setHouseType(houseInfoMap.get(resultDTO.getHomeId()).getHouseType());
             }
         }
         pageInfo.setList(list);

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -32,8 +32,8 @@
             ${column.columnName}
         </foreach>
         ,
-        GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE),
+        GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE) as demandCategoryIds,
-        GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME)
+        GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME) as demandName
         FROM
              ic_resi_user
         <if test="null != subTables and subTables.size() > 0">

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml

@@ -159,7 +159,7 @@
     <select id="selectItemListByGroupId" parameterType="java.lang.String" resultMap="FormItemMap2">
         SELECT
             fi.ID AS item_id,
-            'ic_resi_user' AS table_name,
+            g.table_name AS table_name,
             fi.PARENT_ITEM_ID,
             fi.LABEL,
             fi.ITEM_TYPE,
@@ -179,6 +179,8 @@
             fi.MULTI_SELECT
         FROM
             ic_form_item fi
+        left join ic_form_item_group g
+        on(fi.ITEM_GROUP_ID=g.id)
         WHERE
             fi.DEL_FLAG = '0'
           AND fi.ITEM_GROUP_ID = #{groupId}