Skip to content

A
an-plus-hr
Commit 2490a23b authored by 刘斌's avatar 刘斌
Browse files
Options

fix: 去掉默认草稿状态

parent 59500381
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
admin/src/main/java/com/anplus/hr/service/impl/EmployeeInfoServImpl.java
View file @ 2490a23b
...@@ -480,7 +480,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ ...@@ -480,7 +480,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ
// EmployeeDeptCheckAndSaveParam checkAndSaveParam = // EmployeeDeptCheckAndSaveParam checkAndSaveParam =
// new EmployeeDeptCheckAndSaveParam(deptNameGroups, SecurityUtils.getCurrentUserId(), SecurityUtils.getTenantId()); // new EmployeeDeptCheckAndSaveParam(deptNameGroups, SecurityUtils.getCurrentUserId(), SecurityUtils.getTenantId());
// employeeDeptServ.checkAndSaveDept(checkAndSaveParam); // employeeDeptServ.checkAndSaveDept(checkAndSaveParam);
employeeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus()); // employeeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus());
employeeInfo.setStatus(HrStatusEnum.DRAFT.getStatus()); employeeInfo.setStatus(HrStatusEnum.DRAFT.getStatus());
familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo); familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo);
boolean flag = this.save(employeeInfo); boolean flag = this.save(employeeInfo);
...@@ -530,7 +530,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ ...@@ -530,7 +530,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ
EmployeeInfo employeeInfo = MapstructUtils.convert(param, EmployeeInfo.class); EmployeeInfo employeeInfo = MapstructUtils.convert(param, EmployeeInfo.class);
// 更新员工年龄组 // 更新员工年龄组
EmployeeInfoCalcUtils.calcAgeGroup(employeeInfo); EmployeeInfoCalcUtils.calcAgeGroup(employeeInfo);
employeeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus()); // employeeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus());
employeeInfo.setStatus(HrStatusEnum.DRAFT.getStatus()); employeeInfo.setStatus(HrStatusEnum.DRAFT.getStatus());
familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo); familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo);
boolean flag = this.save(employeeInfo); boolean flag = this.save(employeeInfo);
......
admin/src/main/java/com/anplus/hr/service/impl/EmployeePartTimeInfoServImpl.java
View file @ 2490a23b
...@@ -226,7 +226,7 @@ public class EmployeePartTimeInfoServImpl extends ServiceImpl<EmployeeInfoMapper ...@@ -226,7 +226,7 @@ public class EmployeePartTimeInfoServImpl extends ServiceImpl<EmployeeInfoMapper
// 更新员工年龄组 // 更新员工年龄组
EmployeeInfoCalcUtils.calcAgeGroup(employeePartTimeInfo); EmployeeInfoCalcUtils.calcAgeGroup(employeePartTimeInfo);
employeePartTimeInfo.setPartTimeFlag(HrEmployeeConstants.YES); employeePartTimeInfo.setPartTimeFlag(HrEmployeeConstants.YES);
employeePartTimeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus()); // employeePartTimeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus());
employeePartTimeInfo.setStatus(HrStatusEnum.DRAFT.getStatus()); employeePartTimeInfo.setStatus(HrStatusEnum.DRAFT.getStatus());
return this.save(employeePartTimeInfo); return this.save(employeePartTimeInfo);
} }
......
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