Commit 08471149 authored by huyuchen's avatar huyuchen

Merge branch 'MVP1.6.0' into develop

parents b98d8b67 842718f2
...@@ -319,9 +319,17 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -319,9 +319,17 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
// } // }
//专项扣除从专项扣除表中直接获取 //专项扣除从专项扣除表中直接获取
specialDeducation = deducationSumService.getOne(Wrappers.<TSpecialDeducationSum>query().lambda() specialDeducation = deducationSumService.getOne(Wrappers.<TSpecialDeducationSum>query().lambda()
.eq(TSpecialDeducationSum::getIdNumber,infoVo.getEmpIdcard()).last(CommonConstants.LAST_ONE_SQL)); .eq(TSpecialDeducationSum::getIdNumber,infoVo.getEmpIdcard())
.eq(TSpecialDeducationSum::getCreateMonth,DateUtil.getYear(DateUtil.getCurrentDateTime()) + "12")
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(specialDeducation)) { if (Common.isNotNull(specialDeducation)) {
sdSum = specialDeducation.getCostReduction(); sdSum = BigDecimalUtils.safeAdd(specialDeducation.getSumChildEduMoney()
,specialDeducation.getSumContinuingEducationMoney()
,specialDeducation.getSumHousingLoanMoney()
,specialDeducation.getSumHousingRentMoney()
,specialDeducation.getSumSupportElderlyMoney()
,specialDeducation.getSumBabyMoney()
,specialDeducation.getSumPrivatePension());
} }
if (Common.isNotNull(costReductionList)) { if (Common.isNotNull(costReductionList)) {
costReduction = Collections.max(costReductionList); costReduction = Collections.max(costReductionList);
......
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