Commit 85a1aa04 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 7afc6e87
...@@ -1463,7 +1463,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1463,7 +1463,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (null != preVo.getExitFundInfoList() && !preVo.getExitFundInfoList().isEmpty()) { if (null != preVo.getExitFundInfoList() && !preVo.getExitFundInfoList().isEmpty()) {
preVo.getExitFundInfoList().forEach(fundPreDetailVo -> fundPreDetailVo.setRegisterId(domainR.getData())); preVo.getExitFundInfoList().forEach(fundPreDetailVo -> fundPreDetailVo.setRegisterId(domainR.getData()));
} }
//生成社保待购买或者已购买数据 //生成公积金待购买或者已购买数据
if (null != preVo.getDispatchInfoFundPreVo()) { if (null != preVo.getDispatchInfoFundPreVo()) {
initFundPreInfo(registrationNow, preVo.getDispatchInfoFundPreVo(), user, domainR.getData()); initFundPreInfo(registrationNow, preVo.getDispatchInfoFundPreVo(), user, domainR.getData());
} }
......
...@@ -306,7 +306,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -306,7 +306,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
public Boolean saveFundPreInfo(EmployeeRegistrationPreVo registrationPreVo) { public Boolean saveFundPreInfo(EmployeeRegistrationPreVo registrationPreVo) {
if (Common.isNotNull(registrationPreVo.getFundIsBuy()) if (Common.isNotNull(registrationPreVo.getFundIsBuy())
&& registrationPreVo.getFundIsBuy().equals(CommonConstants.ZERO_STRING) && registrationPreVo.getFundIsBuy().equals(CommonConstants.ZERO_STRING)
&& !registrationPreVo.getExitSocialInfoList().isEmpty()) { && !registrationPreVo.getExitFundInfoList().isEmpty()) {
//删除已存在的入职确认信息对应的公积金明细 //删除已存在的入职确认信息对应的公积金明细
fundPreDetailService.remove(Wrappers.<TFundPreDetail>lambdaQuery() fundPreDetailService.remove(Wrappers.<TFundPreDetail>lambdaQuery()
.eq(TFundPreDetail::getRegisterId, registrationPreVo.getExitFundInfoList() .eq(TFundPreDetail::getRegisterId, registrationPreVo.getExitFundInfoList()
......
...@@ -333,8 +333,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -333,8 +333,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayCommon(TEmployeeInsuranceWorkDayVo vo) { public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayCommon(TEmployeeInsuranceWorkDayVo vo) {
//获取当年所有假期配置表 //获取当年所有假期配置表
Date date = new Date(); Date date = new Date();
List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda() List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda());
.eq(THolidayInfo::getYear,DateUtil.getYear(date)));
Map<Date,String> holidayMap = new HashMap<>(); Map<Date,String> holidayMap = new HashMap<>();
if (Common.isNotNull(holidayInfos)){ if (Common.isNotNull(holidayInfos)){
for (THolidayInfo h:holidayInfos){ for (THolidayInfo h:holidayInfos){
......
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