From c8707150e15be1425a096e40d44f043e9ecce5a2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 八月 2023 12:51:09 +0800
Subject: [PATCH] 修改上传文件名，医学成本的文件展示
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 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 27aaf49..e12aa54 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
@@ -29,6 +29,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.service.IServiceFundService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
@@ -159,11 +160,6 @@
@Override
public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) {
return serviceFundMapper.selectServiceFundList(serviceFund);
- }
-
- @Override
- public List<ServiceFunddetail> getFundDetail(Long id) {
- return serviceFunddetailMapper.selectFundDetailListById(id);
}
@Override
@@ -680,43 +676,52 @@
updateById(serviceFundVO);
id = serviceFundVO.getId();
}
- List<ServiceFunddetail> serviceFunddetails = serviceFundVO.getServiceFunddetails();
-
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
// 鐢ㄤ簬璁板綍绋庡墠銆佺◣鍚庣殑鎬诲拰
double taxBefore = 0.0;
double taxAfter = 0.0;
- for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
- serviceFunddetail.setFundid(id);
- if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getAmount() != null && serviceFunddetail.getTaxedamount() != 0.0 && serviceFunddetail.getAmount() != 0.0) {
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+ //灏囬檮浠惰浆鎴恓son
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
+ serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
+ }
+ if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getTaxedamount() != 0.0 && serviceFunddetailVO.getAmount() != 0.0) {
// 绋庡墠绋庡悗閮戒笉涓虹┖
- if (serviceFunddetail.getId() == null) {
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
continue;
- } else if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getTaxedamount() != 0.0) {
+ } else if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getTaxedamount() != 0.0) {
// 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())));
+ Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetailVO.getTaxedamount())));
// 绋庨噾
String taxation = TaxtUtils.getTaxation(BigDecimal.valueOf(taxationBefore));
- serviceFunddetail.setAmount(Double.valueOf(taxationBefore));
- serviceFunddetail.setTaxamount(Double.parseDouble(taxation));
+ serviceFunddetailVO.setAmount(Double.valueOf(taxationBefore));
+ serviceFunddetailVO.setTaxamount(Double.parseDouble(taxation));
}
- } else if (serviceFunddetail.getAmount() != null && serviceFunddetail.getAmount() != 0.0) {
+ } else if (serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getAmount() != 0.0) {
// 绋庡墠姹傜◣鍚�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetail.getAmount())));
- BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(BigDecimal.valueOf(tax));
- serviceFunddetail.setTaxamount(tax);
- serviceFunddetail.setTaxedamount(taxAfterMoney.doubleValue());
+ double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetailVO.getAmount())));
+ BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetailVO.getAmount()).subtract(BigDecimal.valueOf(tax));
+ serviceFunddetailVO.setTaxamount(tax);
+ serviceFunddetailVO.setTaxedamount(taxAfterMoney.doubleValue());
}
}
//鏍规嵁id鍒ゆ柇鏄柊澧炶繕鏄慨鏀�
- if (serviceFunddetail.getId() == null) {
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
--
Gitblit v1.9.3