代码提交

liusheng

2023-09-21 bdb5b994b566f50dd0acac4b02fc697c656fc94e

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -254,7 +254,7 @@

            taxMoneyVO.setTaxTime(new Date());
            taxMoneyVO.setFirstDay(firstDay);
            taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype()));
//            taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype()));
            taxMoneyVO.setFundID(serviceFunddetail.getFundid());
            taxMoneyVO.setBeneficiaryNo(serviceFunddetail.getBeneficiaryno());
            //查出税前、税、税后的总额（不包含本次）
@@ -267,7 +267,8 @@
            if (CollectionUtils.isNotEmpty(temporarySave)) {
                for (ServiceFunddetail serviceFunddetail1 : temporarySave) {
                    //如果本次的”人员类型“、”受益人编号“在临时集合中存在，则将集合数据中的该受益人的，税前、税金、税后，和总的相加，并将老的覆盖
                    if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
                    // if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
                    if (serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
                        //将集合数据中的该受益人的，税前、税金、税后，和总的相加
                        BigDecimal amounts = BigDecimal.valueOf(taxSum.getAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getAmount())));
                        BigDecimal taxAmounts = BigDecimal.valueOf(taxSum.getTaxAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getTaxamount())));