Commit 0c862e05 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents 60a22c1b 95a731ec
...@@ -682,6 +682,30 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -682,6 +682,30 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查"; //电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查";
return "劳务派遣合同的合同年限不能小于 2 年,请检查"; return "劳务派遣合同的合同年限不能小于 2 年,请检查";
} }
if (Common.isNotNull(preVo.getDispatchPeriodStart())
&& Common.isNotNull(preVo.getDispatchPeriodEnd())){
if (!preVo.getDispatchPeriodEnd().after(preVo.getDispatchPeriodStart())){
return "派遣结束日期需大于派遣开始日期";
}
}
//合同开始时间、合同截止时间 与派遣的合同开始时间、合同截止时间一致
if (Common.isNotNull(preVo.getContractStart())
&& Common.isNotNull(preVo.getDispatchPeriodStart())
&& !preVo.getContractStart().equals(preVo.getDispatchPeriodStart())){
errorMessages.add("合同开始日期与派遣开始日期不一致");
}
if (Common.isNotNull(preVo.getContractEnd())
&& Common.isNotNull(preVo.getDispatchPeriodEnd())
&& !preVo.getContractEnd().equals(preVo.getDispatchPeriodEnd())){
errorMessages.add("合同截止日期与派遣截止日期不一致");
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if (CommonConstants.ONE_STRING.equals(preVo.getContractTerm())){
if (!preVo.getContractDurationYear().equals(preVo.getDispatchPeriodYear())
|| !preVo.getContractDurationMonth().equals(preVo.getDispatchPeriodMonth())){
errorMessages.add("合同的年限同派遣的期限不一致");
}
}
} }
if (Common.isNotNull(preVo.getDispatchPeriodMonth()) && Common.isNotNull(preVo.getDispatchPeriodYear())) { if (Common.isNotNull(preVo.getDispatchPeriodMonth()) && Common.isNotNull(preVo.getDispatchPeriodYear())) {
vo = new TEmployeeContractDateVo(); vo = new TEmployeeContractDateVo();
...@@ -690,30 +714,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -690,30 +714,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
vo.setRegistDate(preVo.getDispatchPeriodStart()); vo.setRegistDate(preVo.getDispatchPeriodStart());
preVo.setDispatchPeriodEnd(this.addYearsMonths(vo)); preVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
} }
if (Common.isNotNull(preVo.getDispatchPeriodStart())
&& Common.isNotNull(preVo.getDispatchPeriodEnd())){
if (!preVo.getDispatchPeriodEnd().after(preVo.getDispatchPeriodStart())){
return "派遣结束日期需大于派遣开始日期";
}
}
//合同开始时间、合同截止时间 与派遣的合同开始时间、合同截止时间一致
if (Common.isNotNull(preVo.getContractStart())
&& Common.isNotNull(preVo.getDispatchPeriodStart())
&& !preVo.getContractStart().equals(preVo.getDispatchPeriodStart())){
errorMessages.add("合同开始日期与派遣开始日期不一致");
}
if (Common.isNotNull(preVo.getContractEnd())
&& Common.isNotNull(preVo.getDispatchPeriodEnd())
&& !preVo.getContractEnd().equals(preVo.getDispatchPeriodEnd())){
errorMessages.add("合同截止日期与派遣截止日期不一致");
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if (CommonConstants.ONE_STRING.equals(preVo.getContractTerm())){
if (!preVo.getContractDurationYear().equals(preVo.getDispatchPeriodYear())
|| !preVo.getContractDurationMonth().equals(preVo.getDispatchPeriodMonth())){
errorMessages.add("合同的年限同派遣的期限不一致");
}
}
// 如果有错误信息,根据具体错误项动态生成提示 // 如果有错误信息,根据具体错误项动态生成提示
if (!errorMessages.isEmpty()) { if (!errorMessages.isEmpty()) {
// 筛选出需要组合提示的错误项 // 筛选出需要组合提示的错误项
......
...@@ -1192,23 +1192,33 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1192,23 +1192,33 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
////电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查"; ////电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查";
return "劳务派遣合同的合同年限不能小于 2 年,请检查"; return "劳务派遣合同的合同年限不能小于 2 年,请检查";
} }
}
if (Common.isNotNull(employeeContractPreVo.getDispatchPeriodStart()) // 合同开始时间、合同截止时间应与派遣的合同开始时间、合同截止时间一致
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodEnd())) { if (Common.isNotNull(employeeContractPreVo.getContractStart())
if (employeeContractPreVo.getDispatchPeriodEnd().before(employeeContractPreVo.getDispatchPeriodStart())) { && Common.isNotNull(employeeContractPreVo.getDispatchPeriodStart())
return "派遣结束日期需大于等于派遣开始日期"; && !employeeContractPreVo.getContractStart().equals(employeeContractPreVo.getDispatchPeriodStart())) {
allErrorMessages.add("合同开始日期与派遣开始日期不一致");
}
if (Common.isNotNull(employeeContractPreVo.getContractEnd())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodEnd())
&& !employeeContractPreVo.getContractEnd().equals(employeeContractPreVo.getDispatchPeriodEnd())) {
allErrorMessages.add("合同截止日期与派遣截止日期不一致");
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if ("劳务派遣合同".equals(employeeContractPreVo.getContractType())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())){
if (!employeeContractPreVo.getContractDurationYear().equals(employeeContractPreVo.getDispatchPeriodYear())
|| !employeeContractPreVo.getContractDurationMonth().equals(employeeContractPreVo.getDispatchPeriodMonth())){
allErrorMessages.add("合同的年限同派遣的期限不一致");
}
} }
} }
// 合同开始时间、合同截止时间应与派遣的合同开始时间、合同截止时间一致
if (Common.isNotNull(employeeContractPreVo.getContractStart()) }
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodStart()) if (Common.isNotNull(employeeContractPreVo.getDispatchPeriodStart())
&& !employeeContractPreVo.getContractStart().equals(employeeContractPreVo.getDispatchPeriodStart())) { && Common.isNotNull(employeeContractPreVo.getDispatchPeriodEnd())) {
allErrorMessages.add("合同开始日期与派遣开始日期不一致"); if (employeeContractPreVo.getDispatchPeriodEnd().before(employeeContractPreVo.getDispatchPeriodStart())) {
} return "派遣结束日期需大于等于派遣开始日期";
if (Common.isNotNull(employeeContractPreVo.getContractEnd())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodEnd())
&& !employeeContractPreVo.getContractEnd().equals(employeeContractPreVo.getDispatchPeriodEnd())) {
allErrorMessages.add("合同截止日期与派遣截止日期不一致");
} }
} }
...@@ -1289,14 +1299,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1289,14 +1299,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if ("劳务派遣合同".equals(employeeContractPreVo.getContractType())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())){
if (!employeeContractPreVo.getContractDurationYear().equals(employeeContractPreVo.getDispatchPeriodYear())
|| !employeeContractPreVo.getContractDurationMonth().equals(employeeContractPreVo.getDispatchPeriodMonth())){
allErrorMessages.add("合同的年限同派遣的期限不一致");
}
}
// 如果有错误信息,根据具体错误项动态生成提示 // 如果有错误信息,根据具体错误项动态生成提示
if (!allErrorMessages.isEmpty()) { if (!allErrorMessages.isEmpty()) {
...@@ -1533,24 +1536,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1533,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(); TEmployeeContractPreVo employeeContractPreVo = new TEmployeeContractPreVo();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) { if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) {
BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo); BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo);
...@@ -1571,6 +1556,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1571,6 +1556,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue; 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); registration.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registration); baseMapper.updateById(registration);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.CONFIRM_SUBMIT, LocalDateTime.now(), 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