From 19b8481dd1b30368f97a2a983f61ff93a340a98c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 18:28:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 2e2f0b6..d0a0f78 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
@@ -758,7 +758,9 @@
}
@Override
- public Boolean totaltax(TotalTaxVO totalTaxVO) {
+ public Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO) {
+ Map<String, List<ServiceFunddetailExcel>> map = new HashMap<>();
+
if (totalTaxVO.getIsTaxAfter() == null) {
//濡備綍涓虹┖锛岄粯璁ゅ綋娌℃湁绠楄繃绋庯紝杩涜鍚堣
totalTaxVO.setIsTaxAfter(0);
@@ -770,8 +772,6 @@
//鐢ㄤ簬杩斿洖excel
List<ServiceFunddetailExcel> serviceFunddetailList = new ArrayList<>();
- //鎵撳嵃excel
- ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
if (totalTaxVO.getIsTaxAfter() == 1) {
//閫氳繃鍙楃泭浜哄悕绉帮紝灏嗙◣鍓嶃�佺◣鍚庣殑鍊肩浉鍔�
@@ -796,8 +796,10 @@
}
serviceFunddetailList.add(serviceFunddetailExcel);
}
- //鎵撳嵃绠楄繃绋庝箣鍚庣殑锛屽悎璁xcel
- util.exportExcel(serviceFunddetailList, "鍚堣涓◣锛堢◣鍚庯級");
+ //杩斿洖绠楄繃绋庝箣鍚庣殑锛屽悎璁�
+ map.put("鍚堣涓◣锛堢◣鍚庯級", serviceFunddetailList);
+ return map;
+
} else {
a:
for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
@@ -814,7 +816,11 @@
for (ServiceFunddetail serviceFunddetail2 : serviceFunddetails) {
if (StringUtils.isEmpty(serviceFunddetail2.getServicesscopename())) {
- throw new BaseException("鏈嶅姟璇存槑涓虹┖,璇锋鏌ュ悗鍐嶈绠�");
+ ServiceFund serviceFund = null;
+ if (serviceFunddetail2.getFundid() == null) {
+ serviceFund = serviceFundMapper.selectById(serviceFunddetail2.getFundid());
+ }
+ throw new BaseException("鏈嶅姟璇存槑涓虹┖,璇锋鏌ュ悗鍐嶈绠�,鎹愮尞鑰呬负 :" + serviceFund.getDonorname());
}
if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && !(serviceFunddetail2.getServicesscopename().equals("绋庡悗"))) {
//绱绋庡墠
@@ -856,10 +862,10 @@
if (ObjectUtils.isNotEmpty(sfeAfter.getBeneficiaryname())) serviceFunddetailList.add(sfeAfter);
}
- //鎵撳嵃绠楃◣涔嬪墠鐨勶紝鍚堣excel
- util.exportExcel(serviceFunddetailList, "鍚堣涓◣锛堢◣鍓嶏級");
+ //杩斿洖绠楃◣涔嬪墠鐨勶紝鍚堣
+ map.put("鍚堣涓◣锛堢◣鍓嶏級", serviceFunddetailList);
+ return map;
}
- return true;
}
--
Gitblit v1.9.3