From 64bce2eb858b95e7851b6c05fa34938dbfb701e6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 五月 2024 16:49:13 +0800
Subject: [PATCH] 修改因算税时间一税，导致获取历史数据不准的问题（加上xh字段） 个税汇总里的功能，删除时一个fund时，将相应的fund的“算税时间” 和"funddetail"表里的“算税时间”、“序号”置空
---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 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 322fa54..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
@@ -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;
@@ -42,7 +42,6 @@
List<ServiceFund> selectServiceFundList(ServiceFund serviceFund);
-
List<FundVO> selectVOList(FundVO fundVO);
@@ -52,9 +51,28 @@
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);
+
+ List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee);
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);
+
+
+ Map<String, Object> exportFeeSum(Integer faxId);
+
+ public Boolean updateFundTaxIdById(Long id, Long fundTaxIds);
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.3