From 561aa63737f42136c69e87a8d907727da235b38c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 八月 2024 18:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 12 +++++++++---
1 files changed, 9 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 af3b14b..08604ec 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
@@ -4,9 +4,7 @@
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.*;
import com.ruoyi.project.domain.vo.*;
import org.springframework.web.bind.annotation.PathVariable;
@@ -55,6 +53,8 @@
List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE, Integer CHECKSTATUS, String donorname);
+ List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee);
+
int countItem(Long infoid, Long itemid);
Long addOrUpdateNew(ServiceFundVO serviceFundVO);
@@ -69,4 +69,10 @@
Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO);
+
+ Map<String, Object> exportFeeSum(Integer faxId);
+
+ public Boolean updateFundTaxIdById(Long id, Long fundTaxIds);
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3