From d51450c60f95c7e6fb7034451e9c1f7497b2b116 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 31 八月 2023 17:38:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
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 4857017..db211f1 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
@@ -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;
--
Gitblit v1.9.3