From 378ec274022582b9e12a3e13e696a375e5e9b491 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 04 九月 2023 15:13:01 +0800
Subject: [PATCH] 添加“捐献者”查询 添加通过“税前”获取“税后”
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java | 27 ++++++++++++++++++++++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 23 +++++++++++++++++++++++
2 files changed, 45 insertions(+), 5 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);
+
+ }
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
index 647e7f6..ac0a5d2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
@@ -13,29 +13,46 @@
@Data
public class SpFinancialExpensesIn extends PageDomain {
- /** 鐢宠浜哄鍚嶆敮鎸佹ā绯� */
+ /**
+ * 鐢宠浜哄鍚嶆敮鎸佹ā绯�
+ */
@ApiModelProperty("鐢宠浜哄鍚嶆敮鎸佹ā绯�")
@Excel(name = "鐢宠浜哄鍚�")
private String APPLICANT;
- /** 鐢宠寮�濮嬫棩鏈� */
+ /**
+ * 鐢宠寮�濮嬫棩鏈�
+ */
@ApiModelProperty("鐢宠寮�濮嬫棩鏈�")
@Excel(name = "鐢宠寮�濮嬫棩鏈�")
private String APPLICATIONBEGTIME;
- /** 鐢宠缁撴潫鏃ユ湡 */
+ /**
+ * 鐢宠缁撴潫鏃ユ湡
+ */
@ApiModelProperty("鐢宠缁撴潫鏃ユ湡")
@Excel(name = "鐢宠缁撴潫鏃ユ湡")
private String APPLICATIONENDTIME;
- /** 瀹℃牳鐘舵�� 0:瀹℃牳锛� 1:寰呭锛� 2:鍏ㄩ儴锛� */
+ /**
+ * 瀹℃牳鐘舵�� 0:瀹℃牳锛� 1:寰呭锛� 2:鍏ㄩ儴锛�
+ */
@ApiModelProperty("瀹℃牳鐘舵��")
@Excel(name = "瀹℃牳鐘舵��")
private int CHECKFLAG;
- /** 璐圭敤绫诲瀷 0:鍏ㄩ儴锛� 鍏朵綑涓哄叿浣撹垂鐢ㄧ被鍨� */
+ /**
+ * 璐圭敤绫诲瀷 0:鍏ㄩ儴锛� 鍏朵綑涓哄叿浣撹垂鐢ㄧ被鍨�
+ */
@ApiModelProperty("璐圭敤绫诲瀷")
@Excel(name = "璐圭敤绫诲瀷")
private int APPLYTYPE;
+
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
+ @ApiModelProperty("鎹愮尞鑰呭鍚�")
+ private String donorname;
+
}
--
Gitblit v1.9.3