From da3edb56ef670c58f6de09d28fde986d6be5a845 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 九月 2023 17:00:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 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 dd8a559..2b30630 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
@@ -682,14 +682,8 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
- if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
- serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
- save(serviceFundVO);
- id = serviceFundVO.getId();
- } else {
- updateById(serviceFundVO);
- id = serviceFundVO.getId();
- }
+ id = saveFund(serviceFundVO);
+
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
if (CollectionUtils.isEmpty(serviceFunddetails)) {
System.out.println("serviceFunddetails涓虹┖鍠�");
@@ -712,6 +706,42 @@
}
return id;
+ }
+
+ @Override
+ public Map<String, Long> performance(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ id = saveFund(serviceFundVO);
+
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
+
+ //鎬荤◣鍓�
+ Double pretaxcosts = 0.00;
+ //鎬荤◣鍚�
+ Double taxedcosts = 0.00;
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ Map<String, Double> performance = serviceFunddetailService.performance(serviceFunddetail);
+ if (!performance.isEmpty()) {
+ Double amount = performance.get("amount");
+ Double taxedamount = performance.get("taxedamount");
+ pretaxcosts = pretaxcosts + amount;
+ taxedcosts = taxedcosts + taxedamount;
+ }
+ serviceFundVO.setPretaxcost(pretaxcosts);
+ serviceFundVO.setTaxedcost(taxedcosts);
+ updateById(serviceFundVO);
+ }
+ Map map = new HashMap();
+ map.put("fundId", id);
+ return map;
}
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
@@ -869,4 +899,18 @@
// return 0;
// }
+ public long saveFund(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
+ serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
+ save(serviceFundVO);
+ id = serviceFundVO.getId();
+ } else {
+ updateById(serviceFundVO);
+ id = serviceFundVO.getId();
+ }
+ return id;
+ }
+
}
--
Gitblit v1.9.3