Commit a42fe908 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-派单暂存

parent 68ebc121
...@@ -801,6 +801,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -801,6 +801,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
@Override @Override
public R<String> doSure(EmployeeRegistrationLeave leave) { public R<String> doSure(EmployeeRegistrationLeave leave) {
YifuUser user = SecurityUtils.getUser();
if (user == null) {
return R.failed("请登录");
}
if (leave != null && Common.isNotNull(leave.getId())) { if (leave != null && Common.isNotNull(leave.getId())) {
EmployeeRegistrationLeave leaveOld = this.getById(leave.getId()); EmployeeRegistrationLeave leaveOld = this.getById(leave.getId());
EmployeeRegistration registrationOld = employeeRegistrationMapper.selectById(leave.getId()); EmployeeRegistration registrationOld = employeeRegistrationMapper.selectById(leave.getId());
...@@ -834,6 +838,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -834,6 +838,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
} }
this.judgeStatus(leave); this.judgeStatus(leave);
leave.setLeaveStatus(CommonConstants.ONE_STRING); leave.setLeaveStatus(CommonConstants.ONE_STRING);
leave.setConfirmUser(user.getNickname());
leave.setConfirmTime(LocalDateTime.now());
this.updateById(leave); this.updateById(leave);
// 离职待办确认后,更新为商险续签待办为已离职 // 离职待办确认后,更新为商险续签待办为已离职
...@@ -855,6 +861,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -855,6 +861,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
@Override @Override
public R<String> doSureBatch(BatchSureLeaveVo vo) { public R<String> doSureBatch(BatchSureLeaveVo vo) {
YifuUser user = SecurityUtils.getUser();
if (user == null) {
return R.failed("请登录");
}
List<String> ids = vo.getIds(); List<String> ids = vo.getIds();
if (Common.isEmpty(ids)) { if (Common.isEmpty(ids)) {
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
...@@ -935,6 +945,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -935,6 +945,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
paramVoList.add(paramVo); paramVoList.add(paramVo);
this.judgeStatus(leave); this.judgeStatus(leave);
leave.setLeaveStatus(CommonConstants.ONE_STRING); leave.setLeaveStatus(CommonConstants.ONE_STRING);
leave.setConfirmUser(user.getNickname());
leave.setConfirmTime(LocalDateTime.now());
successList.add(leave); successList.add(leave);
successNum++; successNum++;
} }
......
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