Commit d0a94b0e authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 873a8555
...@@ -237,7 +237,7 @@ public class TSettleDomainController { ...@@ -237,7 +237,7 @@ public class TSettleDomainController {
TSettleDomainListVo listVo = new TSettleDomainListVo(); TSettleDomainListVo listVo = new TSettleDomainListVo();
listVo.setListSelectVO(list); listVo.setListSelectVO(list);
if (Common.isNotNull(list)){ if (Common.isNotNull(list)){
listVo.setMapSelectVo(list.stream().collect(Collectors.toMap(TSettleDomain::getDepartNo, k->k))); listVo.setMapSelectVo(list.stream().collect(Collectors.toMap(TSettleDomain::getDepartNo, k->k, (existing, replacement) -> existing)));
} }
return listVo; return listVo;
} }
...@@ -255,7 +255,7 @@ public class TSettleDomainController { ...@@ -255,7 +255,7 @@ public class TSettleDomainController {
TSettleDomainListVo listVo = new TSettleDomainListVo(); TSettleDomainListVo listVo = new TSettleDomainListVo();
listVo.setListSelectVO(list); listVo.setListSelectVO(list);
if (Common.isNotNull(list)){ if (Common.isNotNull(list)){
listVo.setMapSelectVo(list.stream().collect(Collectors.toMap(TSettleDomain::getId, k->k))); listVo.setMapSelectVo(list.stream().collect(Collectors.toMap(TSettleDomain::getId, k->k, (existing, replacement) -> existing)));
} }
return listVo; return listVo;
} }
......
...@@ -285,7 +285,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -285,7 +285,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//处理公积金待办信息 //处理公积金待办信息
booleanR = socialDaprUtils.deleteUnProcessFundPreInfo(updatePre.getId()); booleanR = socialDaprUtils.deleteUnProcessFundPreInfo(updatePre.getId());
if (null != booleanR && booleanR.getData().booleanValue()){ if (null != booleanR && booleanR.getData().booleanValue()){
if (sb.length() > 0){ if (sb.length() == 0){
sb.append("公积金"); sb.append("公积金");
}else { }else {
sb.append("/公积金"); sb.append("/公积金");
...@@ -296,7 +296,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -296,7 +296,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
insuranceSearchVo.setRegisterId(updatePre.getId()); insuranceSearchVo.setRegisterId(updatePre.getId());
booleanR = insuranceDaprUtil.delInsurancePreByRegisterId(insuranceSearchVo); booleanR = insuranceDaprUtil.delInsurancePreByRegisterId(insuranceSearchVo);
if (null != booleanR && booleanR.getData().booleanValue()){ if (null != booleanR && booleanR.getData().booleanValue()){
if (sb.length() > 0){ if (sb.length() == 0){
sb.append("商险"); sb.append("商险");
}else { }else {
sb.append("/商险"); sb.append("/商险");
...@@ -306,10 +306,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -306,10 +306,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
int res = contractPreMapper.delete(Wrappers.<TEmployeeContractPre>query().lambda() int res = contractPreMapper.delete(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId, updatePre.getId())); .eq(TEmployeeContractPre::getRegisterId, updatePre.getId()));
if (res > 0){ if (res > 0){
if (sb.length() > 0){ if (sb.length() == 0){
sb.append("/合同");
}else {
sb.append("合同"); sb.append("合同");
}else {
sb.append("/合同");
} }
} }
} catch (Exception e) { } catch (Exception e) {
......
...@@ -422,7 +422,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -422,7 +422,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
List<TSettleDomain> voList = baseMapper.getSettleInfoByCodes(codes); List<TSettleDomain> voList = baseMapper.getSettleInfoByCodes(codes);
TSettleDomainListVo setMap = new TSettleDomainListVo(); TSettleDomainListVo setMap = new TSettleDomainListVo();
if (Common.isNotNull(voList)){ if (Common.isNotNull(voList)){
setMap.setMapVO(voList.stream().collect(Collectors.toMap(TSettleDomain::getDepartNo, k->k))); setMap.setMapVO(voList.stream().collect(Collectors.toMap(TSettleDomain::getDepartNo, k->k, (existing, replacement) -> existing)));
} }
return setMap; return setMap;
} }
......
...@@ -452,25 +452,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -452,25 +452,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override @Override
public Boolean deleteUnProcessSocialPreInfo(String id) { public Boolean deleteUnProcessSocialPreInfo(String id) {
//删除未处理的社保待购买信息 //删除未处理的社保待购买信息
this.remove(Wrappers.<TDispatchInfoPre>query().lambda() return this.remove(Wrappers.<TDispatchInfoPre>query().lambda()
.eq(TDispatchInfoPre::getTypeSub,CommonConstants.ZERO_STRING) .eq(TDispatchInfoPre::getTypeSub,CommonConstants.ZERO_STRING)
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8")) .in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
.eq(TDispatchInfoPre::getRegisterId, id)); .eq(TDispatchInfoPre::getRegisterId, id));
return socialPreDetailService.remove(Wrappers.<TSocialPreDetail>query().lambda()
.eq(TSocialPreDetail::getRegisterId, id));
} }
@Override @Override
public Boolean deleteUnProcessFundPreInfo(String id) { public Boolean deleteUnProcessFundPreInfo(String id) {
//删除未处理的公积金待购买信息 //删除未处理的公积金待购买信息
this.remove(Wrappers.<TDispatchInfoPre>query().lambda() return this.remove(Wrappers.<TDispatchInfoPre>query().lambda()
.eq(TDispatchInfoPre::getTypeSub,CommonConstants.ONE_STRING) .eq(TDispatchInfoPre::getTypeSub,CommonConstants.ONE_STRING)
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8")) .in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
.eq(TDispatchInfoPre::getRegisterId, id)); .eq(TDispatchInfoPre::getRegisterId, id));
return socialPreDetailService.remove(Wrappers.<TSocialPreDetail>query().lambda()
.eq(TSocialPreDetail::getRegisterId, id));
} }
@Override @Override
......
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