From bc9858976661d746d5fc319075631995063aff4d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 14:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=91=E8=AF=81=E4=BB=B6=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java | 2 +- .../main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java | 4 ++-- .../src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java | 4 ++-- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java index 3414805602..74dce9f16f 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java +++ b/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}) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java index aba428a576..89950e63c0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcFollowUpRecordDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java index 482ef97839..cca2734f9c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java +++ b/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; /** * 接种时间 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java index bcb62d6b45..083658ffda 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java +++ b/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未知） diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java index 09919051b9..7cc5c08b82 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcNoticeFormDTO.java +++ b/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; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java index c99a96878c..3ce4110f4c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java +++ b/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; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java index ab4a416d9e..1a1de84a5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageFollowUpFormDTO.java +++ b/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; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 0b10e9fc61..3976b304fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/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) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 3734309c8c..2ec5c5d783 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -258,7 +258,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { - String errorMsg = "修改居民信息失败，身份证号已存在!"; + String errorMsg = "修改居民信息失败，证件号已存在!"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } }