【证件类型】证件错误信息提示修改

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java

@@ -31,7 +31,7 @@ public class SaveOrUpdateParyMemberFormDTO implements Serializable {
     @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class})
     private String name;
 
-    @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class})
+    @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class})
     private String idCard;
 
     @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java

@@ -67,7 +67,7 @@ public class IcFollowUpRecordDTO implements Serializable {
      */
     @ColumnWidth(25)
     @ExcelProperty("身份证号")
-    @NotBlank(message = "身份证号不能为空", groups = {AddUserRequired.class})
+    @NotBlank(message = "证件号不能为空", groups = {AddUserRequired.class})
 	private String idCard;
 
     /**

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

@@ -56,7 +56,7 @@ public class AddIcVaccineFormDTO implements Serializable {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = Vaccine.class)
+    @NotBlank(message = "证件号不能为空", groups = Vaccine.class)
     private String idCard;
     /**
      * 接种时间

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

@@ -71,8 +71,8 @@ public class IcMoveInAddEditFormDTO implements Serializable {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class})
-    @Length(min = 15, max = 18, message = "身份证号位数不正确", groups = AddGroup.class)
+    @NotBlank(message = "证件号不能为空", groups = {AddGroup.class})
+    @Length(min = 9, max = 18, message = "证件号位数不正确", groups = AddGroup.class)
     private String idCard;
     /**
      * 性别（1男2女0未知）

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

@@ -17,6 +17,6 @@ public class IcNoticeFormDTO extends PageFormDTO implements Serializable {
     private static final long serialVersionUID = 7392894573654015338L;
     private String customerId;
     private String noticeId;
-    @NotBlank(message = "身份证号不能为空", groups = DefaultGroup.class)
+    @NotBlank(message = "证件号不能为空", groups = DefaultGroup.class)
     private String idCard;
 }

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

@@ -57,7 +57,7 @@ public class InfoSubmitFromDTO implements Serializable {
 	private String name;
 
 	//@NotBlank(message = "身份证号不能为空")
-	@Length(max=18,message = "身份证号不能超过18位")
+	@Length(max=18,message = "证件号不能超过18位")
 	//别的小程序不统一升级，没办法限制必填。
 	private String idNum;
 

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

@@ -12,10 +12,10 @@ public class PageFollowUpFormDTO extends PageFormDTO {
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class})
+    @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class})
     private String idCard;
 
-    @NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class})
+    @NotBlank(message = "证件号不能为空", groups = {AddUserShowGroup.class})
     private String name;
 
     /**

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

@@ -225,7 +225,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         private String tableName;
 
-        @Excel(name = "身份证号", width = 40)
+        @Excel(name = "证件号", width = 40)
         private String idCard;
 
         @Excel(name = "姓名", width = 25)

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

@@ -258,7 +258,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (map.containsKey("ID_CARD")) {
                     IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), tokenDto.getCustomerId());
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        String errorMsg = "新增居民信息失败，身份证号已存在!";
+                        String errorMsg = "新增居民信息失败，证件号已存在!";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }
@@ -515,7 +515,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     wrapper.ne(IcResiUserEntity::getId, map.get("ID"));
                     List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
                     if (CollectionUtils.isNotEmpty(entityList)) {
-                        String errorMsg = "修改居民信息失败，身份证号已存在!";
+                        String errorMsg = "修改居民信息失败，证件号已存在!";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }