Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -419,6 +419,7 @@ public class AgencyController {
                     .concat("epmet-oper-gov/#/caiji/")
                     .concat(id).concat("?")
                     .concat("name=").concat(name).concat(StrConstant.AND_MARK)
+                    .concat("customerId=").concat(tokenDto.getCustomerId()).concat(StrConstant.AND_MARK)
                     .concat("type=").concat(type).concat(StrConstant.AND_MARK)
                     .concat("userId=").concat(tokenDto.getUserId())
                     .concat(StrConstant.AND_MARK).concat(String.valueOf(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()));

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

@@ -84,8 +84,8 @@ public class IcResiCollectFormDTO implements Serializable {
     /**
      * 1自由0租住
      */
-    @NotNull(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class})
+    @NotBlank(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class})
-    private Integer houseType;
+    private String houseType;
 
     /**
      * 户主姓名

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

@@ -28,7 +28,7 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
-    private Integer heSuanCount;
+    private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；

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

@@ -33,7 +33,7 @@ public class CollectListResultDTO implements Serializable {
     /**
      * 房屋类型，1:自有, 0:租住
      */
-    private Integer houseType;
+    private String houseType;
 
     /**
      * 居住人数
@@ -45,7 +45,7 @@ public class CollectListResultDTO implements Serializable {
     public CollectListResultDTO() {
         this.houseHolderName = "";
         this.address = "";
-        this.houseType = 0;
+        this.houseType = "0";
         this.totalResi = 0;
         this.list = new ArrayList<>();
     }
@@ -70,7 +70,7 @@ public class CollectListResultDTO implements Serializable {
         /**
          * 核酸检测次数
          */
-        private Integer heSuanCount;
+        private String heSuanCount;
 
         /**
          * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种
@@ -81,7 +81,7 @@ public class CollectListResultDTO implements Serializable {
             this.memberName = "";
             this.memberIdNum = "";
             this.memberMobile = "";
-            this.heSuanCount = 0;
+            this.heSuanCount = "0";
             this.ymjz = 0;
         }
     }

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

@@ -71,7 +71,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
     /**
      * 1自由0租住
      */
-	private Integer houseType;
+	private String houseType;
 
     /**
      * 户主姓名

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

@@ -46,7 +46,7 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
-	private Integer heSuanCount;
+	private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -55,7 +55,7 @@
             m.`NAME` AS memberName,
             m.ID_NUM AS memberIdNum,
             m.MOBILE AS memberMobile,
-            m.HESUAN_COUNT AS heSuanCount,
+            m.HE_SUAN_COUNT AS heSuanCount,
             m.YMJZ AS ymjz
         from ic_resi_member m
         where m.DEL_FLAG = 0