Commit fc0bbe3e authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 084fbb7c 0c7ac05f
...@@ -54,7 +54,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -54,7 +54,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 岗位 * 岗位
*/ */
@Length(max = 50, message = "岗位不能超过50个字符") @Length(max = 50, message = "岗位不能超过50个字符")
@ExcelAttribute(name = "岗位", maxLength = 50) @NotBlank(message = "岗位不能为空")
@ExcelAttribute(name = "岗位", maxLength = 50, isNotEmpty = true, errorInfo = "岗位不能为空")
@Schema(description = "岗位") @Schema(description = "岗位")
@ExcelProperty("岗位") @ExcelProperty("岗位")
private String position; private String position;
...@@ -62,7 +63,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -62,7 +63,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/** /**
* 反馈类型 1入职 2离职 * 反馈类型 1入职 2离职
*/ */
@ExcelAttribute(name = "登记类型", readConverterExp = "1=入职,2=离职") @NotBlank(message = "登记类型不能为空")
@ExcelAttribute(name = "登记类型", readConverterExp = "1=入职,2=离职", isNotEmpty = true, errorInfo = "登记类型不能为空")
@Schema(description = "登记类型") @Schema(description = "登记类型")
@ExcelProperty("登记类型") @ExcelProperty("登记类型")
private String feedbackType; private String feedbackType;
...@@ -70,7 +72,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -70,7 +72,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/** /**
* 入/离职日期 * 入/离职日期
*/ */
@ExcelAttribute(name = "入/离职日期", isDate = true) @NotBlank(message = "入/离职日期不能为空")
@ExcelAttribute(name = "入/离职日期", isNotEmpty = true, errorInfo = "入/离职日期不能为空", isDate = true)
@Schema(description = "入/离职日期") @Schema(description = "入/离职日期")
@ExcelProperty("入/离职日期") @ExcelProperty("入/离职日期")
private Date joinLeaveDate; private Date joinLeaveDate;
......
...@@ -236,6 +236,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -236,6 +236,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
data.setRowIndex(rowIndex + 1); data.setRowIndex(rowIndex + 1);
ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex()); ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
if (Common.isNotNull(errorMessage)) { if (Common.isNotNull(errorMessage)) {
errorMessage.setData(data);
errorMessageList.add(errorMessage); errorMessageList.add(errorMessage);
} else { } else {
cachedDataList.add(data); cachedDataList.add(data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment