Merge remote-tracking branch 'remotes/origin/dev' into 市北生产

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

@@ -24,9 +24,7 @@ public class CollectListFormDTO implements Serializable {
     private Integer pageSize;
 
     private String orgId;
-    private String neighborHoodId;
+
-    private String buildingId;
-    private String houseId;
     private String address;
 
     /**

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

@@ -2,10 +2,12 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
+/**
+ * 家庭成员信息
+ * 前端做校验
+ */
 @Data
 public class IcResiCollectMemFormDTO implements Serializable {
     /**
@@ -15,30 +17,30 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    // @NotBlank(message = "姓名不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String name;
 
     /**
      * 居住成员1身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    // @NotBlank(message = "身份证号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String idNum;
 
     /**
      * 居住成员1手机号
      */
-    @NotBlank(message = "手机号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    // @NotBlank(message = "手机号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String mobile;
 
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
-    @NotBlank(message = "核算检测情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    // @NotBlank(message = "核算检测情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；
      */
-    @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private Integer ymjz;
 }

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

@@ -86,9 +86,6 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     public PageData<CollectListResultDTO> getCollectList(CollectListFormDTO formDTO) {
         PageData<CollectListResultDTO> result = new PageData<>(new ArrayList<>(), 0);
         if (StringUtils.isBlank(formDTO.getOrgId()) &&
-                StringUtils.isBlank(formDTO.getNeighborHoodId()) &&
-                StringUtils.isBlank(formDTO.getBuildingId()) &&
-                StringUtils.isBlank(formDTO.getHouseId()) &&
                 StringUtils.isBlank(formDTO.getAddress()) &&
                 StringUtils.isBlank(formDTO.getStartDate()) &&
                 StringUtils.isBlank(formDTO.getEndDate()) ){

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

@@ -30,15 +30,6 @@
         <if test='orgId != null and orgId != "" '>
             AND CONCAT(c.PIDS,':',c.AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
         </if>
-        <if test='neighborHoodId != null and neighborHoodId != "" '>
-            AND c.VILLAGE_ID = #{neighborHoodId}
-        </if>
-        <if test='buildingId != null and buildingId != "" '>
-            AND c.BUILD_ID = #{buildingId}
-        </if>
-        <if test='houseId != null and houseId != "" '>
-            AND c.HOME_ID = #{houseId}
-        </if>
         <if test='address != null and address != "" '>
             AND c.ADDRESS LIKE CONCAT('%',#{address},'%')
         </if>