添加“捐献者”查询 添加通过“税前”获取“税后”

liusheng

2023-09-04 378ec274022582b9e12a3e13e696a375e5e9b491

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -144,6 +144,11 @@

        //startPage();
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        //通过捐献者过滤
        if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
        }

        Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
            @Override
            public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
@@ -1928,4 +1933,22 @@
    }


    /**
     * 根据税前求税后
     */
    @ApiOperation("根据税前求税后")
    @GetMapping(value = "/taxAfterByTaxBefore")
    public AjaxResult taxAfterByTaxBefore(@PathVariable BigDecimal taxBefore) {
        log.info("税前的值为：{}", taxBefore);
        BigDecimal taxAfter = new BigDecimal(0.0);
        if (taxBefore != null) {
            String taxation = TaxtUtils.getTaxation(taxBefore);
            taxAfter = taxBefore.subtract(new BigDecimal(taxation));
            log.info("税前的值为：{}", taxBefore);
        }
        return AjaxResult.success(taxAfter);

    }


}