Commit 95a731ec authored by fangxinjiang's avatar fangxinjiang

提示语优化-fxj

parent bc41a6b0
......@@ -1536,24 +1536,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//判断公积金基数 是否小于 公积金户配置的最低基数
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(registration.getEmpIdcard());
vo.setDeptNo(registration.getDeptNo());
EmpProjectStatusVo exit = getEmpProjectStatus(vo);
if (Common.isNotNull(exit)) {
EmployeeRegistrationReceiveVo receiveVo = new EmployeeRegistrationReceiveVo();
receiveVo.setId(registration.getId());
receiveVo.setEmployeeName(registration.getEmployeeName());
receiveVo.setEmpIdcard(registration.getEmpIdcard());
receiveVo.setReason(RegistConstants.BEFORE_IN_PROJECT);
receiveVo.setEmpProjectId(exit.getEmpProjectId());
receiveVo.setProjectCreateTime(exit.getProjectTime());
receiveVo.setPreVo(preVo);
receiveVoList.add(receiveVo);
continue;
}
TEmployeeContractPreVo employeeContractPreVo = new TEmployeeContractPreVo();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) {
BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo);
......@@ -1574,6 +1556,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue;
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(registration.getEmpIdcard());
vo.setDeptNo(registration.getDeptNo());
EmpProjectStatusVo exit = getEmpProjectStatus(vo);
if (Common.isNotNull(exit)) {
EmployeeRegistrationReceiveVo receiveVo = new EmployeeRegistrationReceiveVo();
receiveVo.setId(registration.getId());
receiveVo.setEmployeeName(registration.getEmployeeName());
receiveVo.setEmpIdcard(registration.getEmpIdcard());
receiveVo.setReason(RegistConstants.BEFORE_IN_PROJECT);
receiveVo.setEmpProjectId(exit.getEmpProjectId());
receiveVo.setProjectCreateTime(exit.getProjectTime());
receiveVo.setPreVo(preVo);
receiveVoList.add(receiveVo);
continue;
}
registration.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registration);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.CONFIRM_SUBMIT, LocalDateTime.now(),
......
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