diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6be4201a24..b088332acf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -33,6 +33,10 @@ public class IcTripReportFormDTO implements Serializable { public interface PcUpdateRequired extends CustomerClientShowGroup { } + public interface PsAdd extends CustomerClientShowGroup { + } + public interface XzzAdd extends CustomerClientShowGroup { + } @NotBlank(message = "主键不能为空", groups = {PcUpdateRequired.class}) private String id; @@ -179,7 +183,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ - @NotBlank(message = "返回方式不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -188,19 +192,22 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ - @NotBlank(message = "来自地区不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ + @NotBlank(message = "疫苗接种针次不能为空", groups = {XzzAdd.class}) private String vaccineNum; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @NotBlank(message = "48小时核算记录不能为空", groups = {XzzAdd.class}) private String isNatRecord; /** * 户籍地 【磐石】 */ + @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; /** * 年龄【磐石】 @@ -209,10 +216,12 @@ public class IcTripReportFormDTO implements Serializable { /** * 来曹事由【磐石】 */ - private String describe; + @NotBlank(message = "来曹事由不能为空", groups = {PsAdd.class}) + private String describeContent; /** * 48小时核算检查结果(阴性 阳性)【磐石】 */ + @NotBlank(message = "48小时核算检测不能为空", groups = {PsAdd.class}) private String natOutcome; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5444efca73..dece4ce2c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -116,6 +116,16 @@ public class IcTripReportRecordController implements ResultDataResolver { if(IcResiUserConstant.USER_TYPE_IC_RESI.equals(formDTO.getUserType())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } String id=icTripReportRecordService.save(formDTO); return new Result().ok(id); } @@ -170,6 +180,16 @@ public class IcTripReportRecordController implements ResultDataResolver { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); } } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } return new Result().ok(icTripReportRecordService.resiSave(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b8d994c851..9b27816145 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -206,19 +206,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl