Commit c9ba39c0 authored by huyuchen's avatar huyuchen

Merge branch 'MVP1.6.0' into develop

parents 08471149 364ed42c
...@@ -59,6 +59,7 @@ import java.io.IOException; ...@@ -59,6 +59,7 @@ import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -287,7 +288,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -287,7 +288,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) {
ySalary = ySalary.add(item.getSalaryMoney()); ySalary = ySalary.add(item.getSalaryMoney());
} }
if (item.getSettlementMonth().contains(CommonConstants.TWELVE_STRING)) { if (item.getSettlementMonth().equals(DateUtil.getMonth(DateUtil.getCurrentDateTime()))) {
//减除费用 //减除费用
if (SalaryConstants.COST_REDUCTION_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.COST_REDUCTION_JAVA.equals(item.getJavaFiedName())) {
costReductionList.add(item.getSalaryMoney()); costReductionList.add(item.getSalaryMoney());
...@@ -320,7 +321,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -320,7 +321,7 @@ 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()) .eq(TSpecialDeducationSum::getIdNumber,infoVo.getEmpIdcard())
.eq(TSpecialDeducationSum::getCreateMonth,DateUtil.getYear(DateUtil.getCurrentDateTime()) + "12") .eq(TSpecialDeducationSum::getCreateMonth,DateUtil.getYearAndMonth(LocalDateTime.now(),0))
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(specialDeducation)) { if (Common.isNotNull(specialDeducation)) {
sdSum = BigDecimalUtils.safeAdd(specialDeducation.getSumChildEduMoney() sdSum = BigDecimalUtils.safeAdd(specialDeducation.getSumChildEduMoney()
......
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