代码提交

liusheng

2023-08-31 d51450c60f95c7e6fb7034451e9c1f7497b2b116

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

@@ -695,6 +695,8 @@
            if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getTaxedamount() != 0.0 && serviceFunddetailVO.getAmount() != 0.0) {
                // 税前税后都不为空
                ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);


                if (serviceFunddetailVO.getId() == null) {
                    serviceFunddetailService.save(serviceFunddetail);
                } else {
@@ -746,6 +748,15 @@
        //将税前、税后金额更新到fund表中
        serviceFundVO.setPretaxcost(taxBefore);
        serviceFundVO.setTaxedcost(taxAfter);
        //申请金额为含税金额
        if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
            //个税   税前（有税） - 税 = 税后
            serviceFundVO.setAmountrequested(taxBefore);
        } else {
            //采购   税前（无税） + 税 = 税后（含税金额）
            serviceFundVO.setAmountrequested(taxAfter);
        }

        updateById(serviceFundVO);

        return id;