diff --git a/src/com/engine/salary/service/impl/LyPZServiceImpl.java b/src/com/engine/salary/service/impl/LyPZServiceImpl.java index 6e2130d57..ba4ff40a2 100644 --- a/src/com/engine/salary/service/impl/LyPZServiceImpl.java +++ b/src/com/engine/salary/service/impl/LyPZServiceImpl.java @@ -195,7 +195,7 @@ public class LyPZServiceImpl extends Service implements LyPZService { BigDecimal resultBigDecimal = NumberUtils.isCreatable(resultStr) ? new BigDecimal(resultStr) : BigDecimal.ZERO; if (kjkm.getSfhbtj() != null && kjkm.getSfhbtj().equals(NumberUtils.INTEGER_ONE)) { // 需要合并计算的会计科目 - totalKjkmValueMap.put(kjkm.getKmbm(), ((BigDecimal)totalKjkmValueMap.getOrDefault(kjkm.getKmbm(), new BigDecimal(0))).add(resultBigDecimal)); + totalKjkmValueMap.put(kjkm.getKmbm() + kjkm.getXzxm(), ((BigDecimal)totalKjkmValueMap.getOrDefault(kjkm.getKmbm() + kjkm.getXzxm(), new BigDecimal(0))).add(resultBigDecimal)); totalKjkmValueMap.put("subCompanyId", subcompanyId); totalKjkmValueMap.put("frzt", fycdgsqcContent); subCompanyIds.add(NumberUtils.isCreatable(subcompanyId) ? Long.valueOf(subcompanyId) : 0); @@ -335,15 +335,15 @@ public class LyPZServiceImpl extends Service implements LyPZService { build.setFzhsFwlb(fzhsBrowserMap.get(kjkm.getGdfwlb())); } // 固定税率类别 - if (kjkm.isFzhsFlag() && StringUtils.isNotBlank(kjkm.getGdsllb()) ) { + if (kjkm.isFzhsSllbFlag() && StringUtils.isNotBlank(kjkm.getGdsllb()) ) { build.setFzhsSllb(fzhsBrowserMap.get(kjkm.getGdsllb())); } // 固定客商 - if (kjkm.isFzhsFlag() && StringUtils.isNotBlank(kjkm.getGdks())) { + if (kjkm.isFzhsKsFlag() && StringUtils.isNotBlank(kjkm.getGdks())) { build.setFzhsKs(fzhsBrowserMap.get(kjkm.getGdks())); } // 固定银行账户 - if (kjkm.isFzhsFlag() && StringUtils.isNotBlank(kjkm.getGdyxzh()) ) { + if (kjkm.isFzhsYhzhFlag() && StringUtils.isNotBlank(kjkm.getGdyxzh()) ) { build.setFzhsYxzh(fzhsBrowserMap.get(kjkm.getGdyxzh())); } }