diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index bf88a6c..b65e253 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -63,40 +63,48 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("employees_id", dto.getId()); qw.eq("iz_history", "N"); qw.eq("org_code", dto.getOrgCode()); EmployeesOrg oldData = employeesOrgService.getOne(qw); + //全部设置成历史 UpdateWrapper uw = new UpdateWrapper(); uw.eq("employees_id", dto.getId()); -// uw.eq("iz_history","1"); -// uw.eq("org_code",dto.getOrgCode()); - EmployeesOrg employeesOrg = new EmployeesOrg(); - employeesOrg.setModifyStatus("1"); - employeesOrgService.update(employeesOrg, uw); - - uw = new UpdateWrapper(); - uw.eq("employees_id", dto.getId()); -// uw.eq("iz_history","1"); uw.eq("org_code", dto.getOrgCode()); - employeesOrg = new EmployeesOrg(); + EmployeesOrg employeesOrg = new EmployeesOrg(); employeesOrg.setIzHistory("Y"); employeesOrgService.update(employeesOrg, uw); - //插入数据 + //获取审批通过记录 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("employees_id", dto.getId()); + queryWrapper.eq("org_code", dto.getOrgCode()); + queryWrapper.eq("status", "2"); + queryWrapper.isNull("modify_status"); + List empOrgList = employeesOrgService.list(queryWrapper); + EmployeesOrg emAdd = new EmployeesOrg(); BeanUtils.copyProperties(dto, emAdd); emAdd.setId(null); emAdd.setEmployeesId(dto.getId()); emAdd.setIzHistory("N"); - emAdd.setModifyStatus("1"); emAdd.setStatus("1"); - emAdd.setApplyType("2"); emAdd.setIzOnline(oldData.getIzOnline()); emAdd.setIzFreeze(oldData.getIzFreeze()); + if(empOrgList.size()>0){ + //有审批通过记录,后续全是变更操作 + emAdd.setModifyStatus("1"); + emAdd.setApplyType("2"); + }else{ + //没有审批通过记录,则后续全是申请操作 + emAdd.setApplyType(oldData.getApplyType()); + } + //插入数据 employeesOrgService.save(emAdd); + //更新员工信息需要有审核流程 审核通过后才修改正式数据 //通知业务平台有员工信息变更 EmployeesApplyMQDto mqdto = new EmployeesApplyMQDto(); @@ -119,6 +127,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl