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/impl/ServiceFundServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 75ca769..5cc56c4 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
@@ -708,7 +708,8 @@
@Override
public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) {
- return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername());
+ log.info("spSelectExpertfee鐨勫叆鍙備负锛歿}", spSelectExpertfee);
+ return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getPfundtaxid(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPadepartid(), spSelectExpertfee.getPausername());
}
@Override
@@ -934,7 +935,7 @@
String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg");
List<VExpertfeeDonor> list2 = vExpertfeeDonorMapper.selectVExpertfeeDonorList2(faxId);
- ExcelUtil<VExpertfeeDonor> util2= new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
+ ExcelUtil<VExpertfeeDonor> util2 = new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
AjaxResult ajaxResult2 = util2.exportExcel(list2, "VExpertfeeDonor");
List<VExpertfeeExpert> list3 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);
@@ -1189,6 +1190,14 @@
@Transactional(rollbackFor = Exception.class)
public Boolean updateFundTaxIdById(Long id, Long fundTaxId) {
- return serviceFundMapper.updateFundTaxIdById(id, fundTaxId);
+ //灏唂und閲岀殑绠楃◣鏃堕棿锛屼笌璇︽儏閲岀殑鐗堢◣鏃堕棿鍏ㄦ竻绌�
+ Boolean aBoolean = serviceFundMapper.updateFundTaxIdById(id, fundTaxId);
+ ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
+ serviceFunddetail.setFundid(id);
+ serviceFunddetail.setTaxTime(null);
+ serviceFunddetail.setXh(null);
+ boolean b = serviceFunddetailMapper.updateTaxTime(serviceFunddetail);
+
+ return b;
}
}
--
Gitblit v1.9.3