MVP1.7.0 批量更新档案

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java

@@ -34,7 +34,7 @@ import java.util.Date;
 public class PreUploadEmpImportTwoVo implements Serializable {
 
 	// （字典值，0外包1派遣2代理）
-	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, maxLength = 2)
+	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, maxLength = 4)
 	private String empNatrue;
 	@ExcelAttribute(name = "员工姓名", maxLength = 32)
 	private String empName;

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java

@@ -36,7 +36,7 @@ import java.util.List;
 public class PreUploadEmpImportVo implements Serializable {
 
 	// （字典值，0外包1派遣2代理）
-	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, maxLength = 2)
+	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, maxLength = 4)
 	private String empNatrue;
 	@ExcelAttribute(name = "员工姓名", maxLength = 32)
 	private String empName;

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java

@@ -389,8 +389,12 @@ public class DiyExcelImportUtil implements Serializable {
 					if (Common.isNotNull(attr.pattern())) {
 						if (!("validityEnd".equals(shuName) && "长期".equals(c)) && dateValue != null) {
 							Date startDate = startDateMap.get(attr.pattern());
-							if (startDate != null && !dateValue.after(startDate)) {
-								errorFormat.append(attr.name()).append("_小于起始日期；");
+							if (startDate != null) {
+								if (!dateValue.after(startDate)) {
+									errorFormat.append(attr.name()).append("_小于起始日期；");
+								}
+							} else {
+								errorFormat.append(attr.name()).append("_未找到起始日期，请将起始日期放在左边列；");
 							}
 						}
 					}
@@ -480,8 +484,12 @@ public class DiyExcelImportUtil implements Serializable {
 				if (Common.isNotNull(attr.pattern())) {
 					if (!("validityEnd".equals(shuName) && "长期".equals(c)) && dateValue != null) {
 						Date startDate = startDateMap.get(attr.pattern());
-						if (startDate != null && !dateValue.after(startDate)) {
-							errorFormat.append(attr.name()).append("_小于起始日期；");
+						if (startDate != null) {
+							if (!dateValue.after(startDate)) {
+								errorFormat.append(attr.name()).append("_小于起始日期；");
+							}
+						} else {
+							errorFormat.append(attr.name()).append("_未找到起始日期，请将起始日期放在左边列；");
 						}
 					}
 				}