Commit 284fccbe authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 3cfe105e
...@@ -810,7 +810,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -810,7 +810,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//1.9.17公积金自动化校验逻辑 //1.9.17公积金自动化校验逻辑
if (employeeRegistrationPre.getServerItem().contains("公积金")) { if (employeeRegistrationPre.getServerItem().contains("公积金")) {
//根据身份证号码和项目编号查询公积金 //根据身份证号码和项目编号查询公积金
TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo(); /*TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo();
cardVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard()); cardVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard());
R<Boolean> fundFlag = socialDaprUtils.selectExitEmpFund(cardVo); R<Boolean> fundFlag = socialDaprUtils.selectExitEmpFund(cardVo);
//是否已购买为是需要判断公积金是否在用或者流程中 //是否已购买为是需要判断公积金是否在用或者流程中
...@@ -839,7 +839,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -839,7 +839,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}else { }else {
return R.other(CommonConstants.TWO_INT,null,"获取公积金配置信息失败!"); return R.other(CommonConstants.TWO_INT,null,"获取公积金配置信息失败!");
} }
} }*/
//(公积金待办为在途在保)流程中的公积金数据不能修改 //(公积金待办为在途在保)流程中的公积金数据不能修改
//查已购买公积金明细 //查已购买公积金明细
if (null != employeeRegistrationPre.getDispatchInfoFundPreVo() if (null != employeeRegistrationPre.getDispatchInfoFundPreVo()
......
...@@ -645,8 +645,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -645,8 +645,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundPreInfo(preVo, preVo.getDispatchInfoFundPreVo(), user, empPreId); initFundPreInfo(preVo, preVo.getDispatchInfoFundPreVo(), user, empPreId);
} }
//如果页面传承为不修改则不更新数据 //如果页面传承为不修改则不更新数据
if (null != preVo && null != preVo.getFundUpdateFlag() if (null != preVo && (null == preVo.getFundUpdateFlag()
&& preVo.getFundUpdateFlag().booleanValue()){ || (null != preVo.getFundUpdateFlag()
&& preVo.getFundUpdateFlag().booleanValue()))){
socialDaprUtils.saveFundPreInfo(preVo); socialDaprUtils.saveFundPreInfo(preVo);
} }
} }
......
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