Commit 44203f59 authored by hongguangwu's avatar hongguangwu

优化人员档案

parent 4fd48bde
...@@ -194,14 +194,14 @@ public class EmployeeVO extends RowIndex implements Serializable { ...@@ -194,14 +194,14 @@ public class EmployeeVO extends RowIndex implements Serializable {
/** /**
* 入学时间 * 入学时间
*/ */
@DateTimeFormat("yyyy-MM-dd HH:mm:ss") @DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "入学时间") @ExcelProperty(value = "入学时间")
private Date admissionDate; private Date admissionDate;
/** /**
* 毕业时间 * 毕业时间
*/ */
@DateTimeFormat("yyyy-MM-dd HH:mm:ss") @DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "毕业时间") @ExcelProperty(value = "毕业时间")
private Date gradutionDate; private Date gradutionDate;
......
...@@ -851,7 +851,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -851,7 +851,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (deptList == null || deptList.isEmpty()) { if (deptList == null || deptList.isEmpty()) {
errorMsg = new HashSet<>(); errorMsg = new HashSet<>();
errorMsg.add(EmployeeConstants.DEPT_NO_EXIST); errorMsg.add(EmployeeConstants.DEPT_NO_EXIST);
errorMessageList.add(new ErrorMessage(2L, errorMsg)); errorMessageList.add(new ErrorMessage(-1L, errorMsg));
return R.failed(errorMessageList); return R.failed(errorMessageList);
} else { } else {
for (TSettleDomain dept : deptList) { for (TSettleDomain dept : deptList) {
......
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