Commit 514b0ad2 authored by huyuchen's avatar huyuchen

huyc 项目档案代码提交

parent 77ae95d8
...@@ -91,18 +91,23 @@ public class EmployeeProjectVO implements Serializable { ...@@ -91,18 +91,23 @@ public class EmployeeProjectVO implements Serializable {
/** /**
* 合同类型(字典值) * 合同类型(字典值)
*/ */
@NotNull(message = "合同类型不能为空")
@ExcelProperty(value ="合同类型") @ExcelProperty(value ="合同类型")
@ExcelAttribute(name = "合同类型",isNotEmpty = true, errorInfo = "项目编码不能为空",maxLength = 2)
private String contractType; private String contractType;
/** /**
* 工时制 * 工时制
*/ */
@NotNull(message = "工时制不能为空")
@ExcelProperty(value ="工时制") @ExcelProperty(value ="工时制")
@ExcelAttribute(name = "工时制",isNotEmpty = true, errorInfo = "工时制不能为空",maxLength = 1)
private String workingHours; private String workingHours;
/** /**
* 就职岗位 * 就职岗位
*/ */
@NotNull(message = "就职岗位不能为空")
@ExcelProperty(value ="就职岗位") @ExcelProperty(value ="就职岗位")
@ExcelAttribute(name = "就职岗位",isNotEmpty = true, errorInfo = "就职岗位不能为空",maxLength = 20) @ExcelAttribute(name = "就职岗位",isNotEmpty = true, errorInfo = "就职岗位不能为空",maxLength = 20)
private String post; private String post;
...@@ -111,6 +116,7 @@ public class EmployeeProjectVO implements Serializable { ...@@ -111,6 +116,7 @@ public class EmployeeProjectVO implements Serializable {
* 入职日期 * 入职日期
*/ */
@ExcelProperty(value ="入职日期") @ExcelProperty(value ="入职日期")
@NotNull(message = "入职日期不能为空")
@Past @Past
private LocalDate enjoinDate; private LocalDate enjoinDate;
...@@ -118,6 +124,7 @@ public class EmployeeProjectVO implements Serializable { ...@@ -118,6 +124,7 @@ public class EmployeeProjectVO implements Serializable {
* 试用期(单位月) * 试用期(单位月)
*/ */
@ExcelProperty(value ="试用期") @ExcelProperty(value ="试用期")
@NotNull(message = "试用期不能为空")
private String tryPeriod; private String tryPeriod;
} }
...@@ -50,6 +50,11 @@ public interface CommonConstants { ...@@ -50,6 +50,11 @@ public interface CommonConstants {
*/ */
Long DEPT_TREE_ROOT_ID = 0L; Long DEPT_TREE_ROOT_ID = 0L;
/**
* 1L
*/
Long LONG_1 = 1L;
/** /**
* 菜单 * 菜单
*/ */
...@@ -257,4 +262,14 @@ public interface CommonConstants { ...@@ -257,4 +262,14 @@ public interface CommonConstants {
String ID = "ID"; String ID = "ID";
String PARAM_IS_NOT_ERROR = "传参异常,请检查参数"; String PARAM_IS_NOT_ERROR = "传参异常,请检查参数";
int EXCEL_EXPORT_LIMIT = 60000; int EXCEL_EXPORT_LIMIT = 60000;
/**
* 成功颜色
*/
String GREEN = "green";
/**
* 失败颜色
*/
String RED = "red";
} }
...@@ -213,6 +213,10 @@ public interface ErrorCodes { ...@@ -213,6 +213,10 @@ public interface ErrorCodes {
* 存在已减档的档案,禁止导入 * 存在已减档的档案,禁止导入
*/ */
String CHECKS_REDUCE_EMP_ERROR = "checks.reduce.emp.error"; String CHECKS_REDUCE_EMP_ERROR = "checks.reduce.emp.error";
/**
* 该人员暂无档案信息,请先至“在档人员”处建档
*/
String CHECKS_EXIT_EMPPROJECT_ERROR = "checks.exit.empproject.error";
/** /**
* 存在已减项的项目,禁止导入 * 存在已减项的项目,禁止导入
*/ */
......
...@@ -323,4 +323,17 @@ public class DictController { ...@@ -323,4 +323,17 @@ public class DictController {
return sysDictItemService.getDictToValue(); 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);
}
} }
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