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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java

@@ -87,19 +87,16 @@ public class IcHouseFormDTO implements Serializable {
     /**
      * 房主姓名
      */
-    @NotBlank(message = "房主姓名不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerName;
 
     /**
      * 房主电话
      */
-    @NotBlank(message = "房主电话不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerPhone;
 
     /**
      * 房主身份证号
      */
-    @NotBlank(message = "房主身份证号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerIdCard;
 
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_gov_org`.`ic_house`
+    MODIFY COLUMN `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主姓名' AFTER `RENT_FLAG`,
+    MODIFY COLUMN `OWNER_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主电话' AFTER `OWNER_NAME`,
+    MODIFY COLUMN `OWNER_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主身份证号' AFTER `OWNER_PHONE`;

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -71,6 +71,15 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         //list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
         //改为查询ic_form_list_item
         List<TableHeaderResultDTO> result=baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode());
+
+        for (TableHeaderResultDTO column : result) {
+            if ("HOME_ID".equals(column.getColumnName())) {
+                // web界面table
+                column.setLabel("所属房屋");
+                break;
+            }
+        }
+
         if(!CollectionUtils.isEmpty(result)){
             list.addAll(result);
         }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql → epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql

@@ -1,2 +1 @@
--- 修改所属家庭项label为户号
 update ic_form_item set LABEL='房间号' where LABEL='所属家庭';

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql

@@ -0,0 +1,12 @@
+UPDATE ic_form_list_item 
+SET SORT = '5' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%身份证%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+	
+UPDATE ic_form_list_item 
+SET SORT = '6' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%性别%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+