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 b6b2ad9856..354c3be87c 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 @@ -9,6 +9,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -118,7 +119,7 @@ public class IcTripReportRecordController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); @@ -182,7 +183,7 @@ public class IcTripReportRecordController implements ResultDataResolver { } } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index c0841b4a29..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("在曹事由(100字以内)") + @ExcelProperty("来曹事由(100字以内)") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index bfdd634a1f..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 在曹事由(100字以内)【磐石】 + * 来曹事由(100字以内)【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "在曹事由(100字以内)",order = 8) + @ExcelProperty(value = "来曹事由(100字以内)",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 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 4debd80010..00d805abad 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 @@ -207,8 +207,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl