From e623e633f1a28b66632d9c17dcfe2f6e2a78073b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 八月 2023 16:24:21 +0800
Subject: [PATCH] 代码修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 14 ++++++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 8 ++++++--
2 files changed, 18 insertions(+), 4 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 19f6304..e090c67 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
@@ -489,6 +489,7 @@
if (CheckFlag == 2) {
//搴斿尰闄㈣姹傚鏋滃嚭鐜伴��鍥烇紝鐩存帴閫�鍒板彂璧疯��
FlowLevel = 0;
+ RecordStatus = -1;
} else {
RecordStatus = (FlowLevel + 1) * 2 - 1;
FlowLevel = (FlowLevel - 1);
@@ -500,6 +501,7 @@
serviceFund.setRecordstatus(RecordStatus);
serviceFund.setFlowlevel(FlowLevel);
+ serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
ServiceFundflow serviceFundflow = new ServiceFundflow();
SysUser user = loginUser.getUser();
@@ -1073,8 +1075,10 @@
}
dataMap.put("items", newList);
- dataMap.put("JEXS", serviceFund.getAmountrequested());
- dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
+ dataMap.put("JEXS", serviceFund.getPretaxcost());
+ dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "鏁�");
+// dataMap.put("JEXS", serviceFund.getAmountrequested());
+// dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
dataMap.put("YYMMDD", time);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index e12aa54..7ce7a15 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -699,6 +699,13 @@
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
+ //璁＄畻绋庨噾
+ if (serviceFunddetail.getAmount() != null) {
+ taxBefore = taxBefore + serviceFunddetail.getAmount();
+ }
+ if (serviceFunddetail.getTaxedamount() != null) {
+ taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
+ }
continue;
} else if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getTaxedamount() != 0.0) {
// 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
@@ -726,9 +733,12 @@
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
- if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- //濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
+// if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
+ //濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
+ if (serviceFunddetail.getAmount() != null) {
taxBefore = taxBefore + serviceFunddetail.getAmount();
+ }
+ if (serviceFunddetail.getTaxedamount() != null) {
taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
}
}
--
Gitblit v1.9.3