diff --git a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java index 4b8be40f1..f2db3d90e 100644 --- a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java @@ -753,6 +753,10 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport map.put("shkcxTcf" ,map.getOrDefault("shkcxTcf", BigDecimal.valueOf(0)).add(shkcxTcf)); BigDecimal shkcxGstz = NumberUtils.isCreatable(reportPO.getShkcxGstz()) ? new BigDecimal(reportPO.getShkcxGstz()) : BigDecimal.ZERO; map.put("shkcxGstz" ,map.getOrDefault("shkcxGstz", BigDecimal.valueOf(0)).add(shkcxGstz)); + BigDecimal shkcxSyjt = NumberUtils.isCreatable(reportPO.getShkcxSyjt()) ? new BigDecimal(reportPO.getShkcxSyjt()) : BigDecimal.ZERO; + map.put("shkcxSyjt" ,map.getOrDefault("shkcxSyjt", BigDecimal.valueOf(0)).add(shkcxSyjt)); + BigDecimal shkcxPxf = NumberUtils.isCreatable(reportPO.getShkcxPxf()) ? new BigDecimal(reportPO.getShkcxPxf()) : BigDecimal.ZERO; + map.put("shkcxPxf" ,map.getOrDefault("shkcxPxf", BigDecimal.valueOf(0)).add(shkcxPxf)); BigDecimal shkcxQt = NumberUtils.isCreatable(reportPO.getShkcxQt()) ? new BigDecimal(reportPO.getShkcxQt()) : BigDecimal.ZERO; map.put("shkcxQt" ,map.getOrDefault("shkcxQt", BigDecimal.valueOf(0)).add(shkcxQt)); BigDecimal bysf = NumberUtils.isCreatable(reportPO.getBysf()) ? new BigDecimal(reportPO.getBysf()) : BigDecimal.ZERO; @@ -775,6 +779,8 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport .shkcxAxhzj(map.getOrDefault("shkcxAxhzj", BigDecimal.ZERO).toString()) .shkcxTcf(map.getOrDefault("shkcxTcf", BigDecimal.ZERO).toString()) .shkcxGstz(map.getOrDefault("shkcxGstz", BigDecimal.ZERO).toString()) + .shkcxSyjt(map.getOrDefault("shkcxSyjt", BigDecimal.ZERO).toString()) + .shkcxPxf(map.getOrDefault("shkcxPxf", BigDecimal.ZERO).toString()) .shkcxQt(map.getOrDefault("shkcxQt", BigDecimal.ZERO).toString()) .bysf(map.getOrDefault("bysf", BigDecimal.ZERO).toString()) .build();