huyc 项目档案代码提交

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

@@ -91,18 +91,23 @@ public class EmployeeProjectVO implements Serializable {
     /**
      * 合同类型（字典值）
      */
+	@NotNull(message = "合同类型不能为空")
 	@ExcelProperty(value ="合同类型")
+	@ExcelAttribute(name = "合同类型",isNotEmpty = true, errorInfo = "项目编码不能为空",maxLength = 2)
     private String contractType;
 
     /**
      * 工时制
      */
+	@NotNull(message = "工时制不能为空")
 	@ExcelProperty(value ="工时制")
+	@ExcelAttribute(name = "工时制",isNotEmpty = true, errorInfo = "工时制不能为空",maxLength = 1)
     private String workingHours;
 
     /**
      * 就职岗位
      */
+	@NotNull(message = "就职岗位不能为空")
 	@ExcelProperty(value ="就职岗位")
 	@ExcelAttribute(name = "就职岗位",isNotEmpty = true, errorInfo = "就职岗位不能为空",maxLength = 20)
     private String post;
@@ -111,6 +116,7 @@ public class EmployeeProjectVO implements Serializable {
      * 入职日期
      */
 	@ExcelProperty(value ="入职日期")
+	@NotNull(message = "入职日期不能为空")
 	@Past
     private LocalDate enjoinDate;
 
@@ -118,6 +124,7 @@ public class EmployeeProjectVO implements Serializable {
      * 试用期（单位月）
      */
 	@ExcelProperty(value ="试用期")
+	@NotNull(message = "试用期不能为空")
     private String tryPeriod;
 
 }

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

@@ -50,6 +50,11 @@ public interface CommonConstants {
 	 */
 	Long DEPT_TREE_ROOT_ID = 0L;
 
+	/**
+	 * 1L
+	 */
+	Long LONG_1 = 1L;
+
 	/**
 	 * 菜单
 	 */
@@ -257,4 +262,14 @@ public interface CommonConstants {
 	String ID = "ID";
 	String PARAM_IS_NOT_ERROR = "传参异常，请检查参数";
 	int EXCEL_EXPORT_LIMIT = 60000;
+
+	/**
+	 * 成功颜色
+	 */
+	String GREEN = "green";
+
+	/**
+	 * 失败颜色
+	 */
+	String RED = "red";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -213,6 +213,10 @@ public interface ErrorCodes {
 	 * 存在已减档的档案，禁止导入
 	 */
 	String CHECKS_REDUCE_EMP_ERROR = "checks.reduce.emp.error";
+	/**
+	 * 该人员暂无档案信息，请先至“在档人员”处建档
+	 */
+	String CHECKS_EXIT_EMPPROJECT_ERROR = "checks.exit.empproject.error";
 	/**
 	 * 存在已减项的项目，禁止导入
 	 */

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java

@@ -323,4 +323,17 @@ public class DictController {
 		return sysDictItemService.getDictToValue();
 	}
 
+	/**
+	 * @Description: 根据type和value获取字典值
+	 * @Author: huyc
+	 * @Date: 2022/7/1
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Inner
+	@PostMapping("/inner/getLableFronValue")
+	public R<String> getLableFronValue(@RequestParam String value,@RequestParam String type) {
+		return sysDictItemService.getLableFronValue(value,type);
+	}
+
+
 }