From a8b458570fea9039e464150da723b9415b95a64c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 01 二月 2024 16:30:05 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index ea57e34..af3b14b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -1,10 +1,12 @@
 package com.ruoyi.project.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.domain.ServiceFund;
 import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.ServiceFunddetailExcel;
 import com.ruoyi.project.domain.vo.*;
 import org.springframework.web.bind.annotation.PathVariable;
 
@@ -41,7 +43,6 @@
 
     List<ServiceFund> selectServiceFundList(ServiceFund serviceFund);
 
-    List<ServiceFunddetail> getFundDetail(Long id);
 
     List<FundVO> selectVOList(FundVO fundVO);
 
@@ -52,9 +53,20 @@
 
     String returnId(Long id);
 
-    List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE);
+    List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE, Integer CHECKSTATUS, String donorname);
 
     int countItem(Long infoid, Long itemid);
 
     Long addOrUpdateNew(ServiceFundVO serviceFundVO);
-}
+
+    /**
+     * 缁╂晥璁$畻
+     *
+     * @param serviceFundVO
+     * @return
+     */
+    Map<String, Long> performance(ServiceFundVO serviceFundVO);
+
+    Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO);
+
+}
\ No newline at end of file

--
Gitblit v1.9.3