Commit ac1c130f authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent c6052080
......@@ -1103,8 +1103,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insuranceDaprUtil.saveInsurancePreInfo(preVo);
}
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVos();
if (Common.isNotNull(employeeContractPreVo) && Common.isNotNull(employeeContractPreVo.getContractFlag())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag())) {
if (preVo.getServerItem().contains("合同") && Common.isNotNull(employeeContractPreVo)) {
//生成合同待购买数据
initContractPreInfo(registrationNow, employeeContractPreVo, user, domainR.getData());
}
......
......@@ -220,8 +220,8 @@ public class THolidayInfoController {
**/
@Inner
@PostMapping("/inner/selectBeforeOrAfterWorkDayCommon")
public R selectBeforeOrAfterWorkDayInnerCommon(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return R.ok(tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(vo));
public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayInnerCommon(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(vo);
}
/**
......
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