From 7a1a246539b16c7e81006fb79dd2885d94aa8c01 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 11 三月 2024 18:14:10 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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..fd78af6 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,10 @@ 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.*; import com.ruoyi.project.domain.vo.*; import org.springframework.web.bind.annotation.PathVariable; @@ -41,7 +41,6 @@ List<ServiceFund> selectServiceFundList(ServiceFund serviceFund); - List<ServiceFunddetail> getFundDetail(Long id); List<FundVO> selectVOList(FundVO fundVO); @@ -52,9 +51,21 @@ 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