diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index c15dfaa7c..31cab2bc1 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1382,7 +1382,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } List salarySobIds = salarySobList.stream().filter(sob -> calculateSobIds.contains(sob.getId())).map(SalarySobPO::getId).collect(Collectors.toList()); - LocalDateRange dateRange = LocalDateRange.builder().fromDate(SalaryDateUtil.dateStrToLocalDate(param.getStartDate())).endDate(SalaryDateUtil.dateStrToLocalDate(param.getStartDate())).build(); + LocalDateRange dateRange = LocalDateRange.builder().fromDate(SalaryDateUtil.dateStrToLocalYearMonth(param.getStartDate())).endDate(SalaryDateUtil.dateStrToLocalYearMonth(param.getStartDate())).build(); List salaryAcctRecordPOS = getSalaryAcctRecordService(user).listBySalarySobIdsAndSalaryMonth(salarySobIds, dateRange); List salaryAcctRecordIds = salaryAcctRecordPOS.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList()); // 获取配置的薪资项目id @@ -1479,16 +1479,16 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe value.put(jzbmItemId.toString(), split[1]); } // 应发工资 = 本月(次)应税收入合计-项目补贴-加班工资 - BigDecimal yssrhj = new BigDecimal(value.get(bycyssrhjItemId.toString()) == null ? "0" : value.get(bycyssrhjItemId.toString()).toString()); - BigDecimal xmbt = new BigDecimal(value.get(xmbtItemId.toString()) == null ? "0" : value.get(xmbtItemId.toString()).toString()); - BigDecimal jbgz = new BigDecimal(value.get(jbgzItemId.toString()) == null ? "0" : value.get(jbgzItemId.toString()).toString()); + BigDecimal yssrhj = new BigDecimal(value.get(bycyssrhjItemId.toString()) == null || StringUtils.isBlank(value.get(bycyssrhjItemId.toString()).toString()) ? "0" : value.get(bycyssrhjItemId.toString()).toString()); + BigDecimal xmbt = new BigDecimal(value.get(xmbtItemId.toString()) == null || StringUtils.isBlank(value.get(xmbtItemId.toString()).toString()) ? "0" : value.get(xmbtItemId.toString()).toString()); + BigDecimal jbgz = new BigDecimal(value.get(jbgzItemId.toString()) == null || StringUtils.isBlank(value.get(jbgzItemId.toString()).toString()) ? "0" : value.get(jbgzItemId.toString()).toString()); value.put("yfgz", yssrhj.subtract(xmbt).subtract(jbgz)); // 应发工资小计 = 本月(次)应税收入合计-通讯费 - BigDecimal txf = new BigDecimal(value.get(txfItemId.toString()) == null ? "0" : value.get(txfItemId.toString()).toString()); + BigDecimal txf = new BigDecimal(value.get(txfItemId.toString()) == null || StringUtils.isBlank(value.get(txfItemId.toString()).toString()) ? "0" : value.get(txfItemId.toString()).toString()); value.put("yfgzxj", yssrhj.subtract(xmbt).subtract(txf)); // 公积金(个人)= 公积金+公积金调差项 - BigDecimal gjj = new BigDecimal(value.get(gjjItemId.toString()) == null ? "0" : value.get(gjjItemId.toString()).toString()); - BigDecimal gjjtcx = new BigDecimal(value.get(gjjtcxItemId.toString()) == null ? "0" : value.get(gjjtcxItemId.toString()).toString()); + BigDecimal gjj = new BigDecimal(value.get(gjjItemId.toString()) == null || StringUtils.isBlank(value.get(gjjItemId.toString()).toString()) ? "0" : value.get(gjjItemId.toString()).toString()); + BigDecimal gjjtcx = new BigDecimal(value.get(gjjtcxItemId.toString()) == null || StringUtils.isBlank(value.get(gjjtcxItemId.toString()).toString()) ? "0" : value.get(gjjtcxItemId.toString()).toString()); value.put("gjjgr", gjj.add(gjjtcx)); });