huyc 项目档案代码提交

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

@@ -96,7 +96,7 @@ public class EmployeeProjectVO extends RowIndex implements Serializable {
      */
 	@NotNull(message = "合同类型不能为空")
 	@ExcelProperty(value ="合同类型")
-	@ExcelAttribute(name = "合同类型",isNotEmpty = true, errorInfo = "合同类型不能为空",maxLength = 10,isDataId = true,dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE)
+	@ExcelAttribute(name = "合同类型",isNotEmpty = true, errorInfo = "合同类型不能为空",maxLength = 10,isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
     private String contractType;
 
     /**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/Constants/EmployeeConstants.java

@@ -9,5 +9,14 @@ public class EmployeeConstants {
 	public static final String REMARL_LENGTH = "备注长度超过200";
 	public static final String POST_LENGTH = "就职岗位长度超过20";
 	public static final String DEPT_NO_LENGTH = "项目编码长度超过20";
+	/**
+	 * 无数据可更新
+	 **/
+	public static final String NO_DATA_UPDATE = "无数据可更新";
+
+	/**
+	 * 数据更新是失败
+	 **/
+	public static final String DATA_UPDATE_FAIL = "数据更新失败！";
 
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttributeConstants.java

@@ -34,8 +34,9 @@ public class ExcelAttributeConstants {
 
 	//员工合同类型
 	public static final String EMPLOYEE_CONTRACT_TYPE = "contract_type" ;
+
 	//员工合同工时制 1标准工时 2 综合工时 3不定时工时制
-	public static final String WORKING_HOURS = "contract_working_hours";
+	public static final String WORKING_HOURS = "working_hours";
 
 	//员工合同续签情况
 	public static final String EMPLOYEE_SITUATION_TYPE = "situation_type" ;