From 378ec274022582b9e12a3e13e696a375e5e9b491 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 04 九月 2023 15:13:01 +0800
Subject: [PATCH] 添加“捐献者”查询 添加通过“税前”获取“税后”
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 69f9cbe..c42353e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/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);
+
+ }
+
+
}
--
Gitblit v1.9.3