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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java

@@ -52,24 +52,32 @@ public class ResiCollectFormDTO implements Serializable {
      */
     @NotBlank(message = "小区不能为空", groups = InternalShowGroup.class)
     private String villageId;
+    @NotBlank(message = "小区名不能为空", groups = InternalShowGroup.class)
+    private String villageName;
 
     /**
      * 所属楼宇Id
      */
     @NotBlank(message = "楼栋不能为空", groups = InternalShowGroup.class)
     private String buildId;
+    @NotBlank(message = "楼栋名不能为空",groups = InternalShowGroup.class)
+    private String buildName;
 
     /**
      * 单元id
      */
     @NotBlank(message = "单元不能为空", groups = InternalShowGroup.class)
     private String unitId;
+    @NotBlank(message = "单元名不能为空",groups = InternalShowGroup.class)
+    private String unitName;
 
     /**
      * 所属家庭Id
      */
     @NotBlank(message = "家庭不能为空", groups = InternalShowGroup.class)
     private String homeId;
+    @NotBlank(message = "家庭名不能为空",groups = InternalShowGroup.class)
+    private String homeName;
 
     /**
      * 详细地址
@@ -102,4 +110,5 @@ public class ResiCollectFormDTO implements Serializable {
     @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
     private String userId;
 
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestCollectResDTO.java

@@ -59,6 +59,11 @@ public class LatestCollectResDTO implements Serializable {
      */
     private Integer totalResi;
 
+    private String villageName;
+    private String buildName;
+    private String unitName;
+    private String homeName;
+
     @Valid
     private List<IcResiCollectMemFormDTO> memberList;
 
@@ -78,5 +83,9 @@ public class LatestCollectResDTO implements Serializable {
         this.houseHolderName="";
         this.totalResi=0;
         this.memberList=new ArrayList<>();
+        this.villageName="";
+        this.buildName="";
+        this.unitName="";
+        this.homeName="";
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java

@@ -82,5 +82,8 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
      * 居住成员人数
      */
 	private Integer totalResi;
-
+	private String villageName;
+	private String buildName;
+	private String unitName;
+	private String homeName;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@@ -230,5 +230,9 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         resDTO.setHouseType(entity.getHouseType());
         resDTO.setHouseHolderName(entity.getHouseHolderName());
         resDTO.setTotalResi(entity.getTotalResi());
+        resDTO.setVillageName(entity.getVillageName());
+        resDTO.setBuildName(entity.getBuildName());
+        resDTO.setUnitName(entity.getUnitName());
+        resDTO.setHomeName(entity.getHomeName());
     }
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.34__modify_collect.sql

@@ -0,0 +1,4 @@
+alter TABLE ic_resi_collect add COLUMN `VILLAGE_NAME` varchar(64) DEFAULT NULL COMMENT '所属小区名称' AFTER VILLAGE_ID;
+alter TABLE ic_resi_collect add COLUMN `BUILD_NAME` varchar(64) DEFAULT NULL COMMENT '所属楼宇名称' AFTER BUILD_ID;
+alter TABLE ic_resi_collect add COLUMN `UNIT_NAME` varchar(64) DEFAULT NULL COMMENT '单元名' AFTER UNIT_ID;
+alter TABLE ic_resi_collect add COLUMN `HOME_NAME` varchar(64) DEFAULT NULL COMMENT '房间名' AFTER HOME_ID;