From 22655ad10d386f0fc3c38389f519d3d188b46f19 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 十月 2023 16:29:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 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 1cb4537..115b3f8 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
@@ -21,6 +21,7 @@
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFunddetailSharedService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -104,6 +105,9 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getFlowlevel() != null) {
+ wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
+ }
return this.list(wrappers);
}
@@ -154,7 +158,14 @@
//鏁版嵁鍙戦�佺粰璐㈠姟
uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
}
- boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
+ boolean result = false;
+ for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) {
+ if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) {
+ result = detailSharedService.save(serviceFunddetailShared);
+ } else {
+ log.info("serviceFunddetailShared涓虹┖浜嗭紒锛侊紒");
+ }
+ }
return result;
}
@@ -648,8 +659,8 @@
}
@Override
- public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
- return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
+ public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
+ return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
}
@Override
@@ -671,13 +682,8 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
- if (serviceFundVO.getId() == null) {
- 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涓虹┖鍠�");
@@ -690,6 +696,9 @@
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
+ serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
+ }
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
if (serviceFunddetailVO.getId() == null) {
@@ -700,6 +709,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) {
@@ -857,4 +902,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