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-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 83bef1a..a4f3aaf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -81,8 +81,9 @@
}
String phone = serviceFundShared.getPhone();
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
-
+ log.info("checkReportInfo涓叆鍙侷D涓猴細{}", serviceFundShared.getId());
+ Boolean aBoolean = serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId(), null);
+ log.info("fund鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean);
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryInfoById(serviceFund);
@@ -309,7 +310,7 @@
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
Boolean aBoolean = serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
- log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}",aBoolean);
+ log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}", aBoolean);
//灏咶lowlevel 璁剧疆涓�0;
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
@@ -639,35 +640,35 @@
serviceFundflowrule.setApplytype("1");
List<ServiceFundflowrule> serviceFundflowrules2 = iServiceFundflowruleService.queryList(serviceFundflowrule);
log.info("涓撳鍔冲姟鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules2.get(0).getTotallevel());
- addFunfShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1");
+ addFundShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1");
//浼︾悊涓撳鍔冲姟璐圭敵璇�
serviceFundflowrule.setApplytype("2");
List<ServiceFundflowrule> serviceFundflowrules3 = iServiceFundflowruleService.queryList(serviceFundflowrule);
log.info("浼︾悊涓撳鍔冲姟璐圭敵璇�:{}", serviceFundflowrules3.get(0).getTotallevel());
- addFunfShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2");
+ addFundShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2");
//鍖诲鎴愭湰鎶ラ攢
serviceFundflowrule.setApplytype("3");
List<ServiceFundflowrule> serviceFundflowrules4 = iServiceFundflowruleService.queryList(serviceFundflowrule);
log.info("鍖诲鎴愭湰鎶ラ攢:{}", serviceFundflowrules4.get(0).getTotallevel());
- addFunfShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3");
+ addFundShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3");
//鍔炲叕璐圭敤鎶ラ攢
serviceFundflowrule.setApplytype("4");
List<ServiceFundflowrule> serviceFundflowrules5 = iServiceFundflowruleService.queryList(serviceFundflowrule);
log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules5.get(0).getTotallevel());
- addFunfShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4");
+ addFundShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4");
//缁╂晥瀹℃壒鎶ラ攢
serviceFundflowrule.setApplytype("5");
List<ServiceFundflowrule> serviceFundflowrules6 = iServiceFundflowruleService.queryList(serviceFundflowrule);
log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules6.get(0).getTotallevel());
- addFunfShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5");
+ addFundShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5");
}
- private void addFunfShared(Long totallevel, String applyType) {
+ private void addFundShared(Long totallevel, String applyType) {
ServiceFund serviceFund = new ServiceFund();
serviceFund.setFlowlevel(totallevel);
serviceFund.setUploadStates(1);
@@ -682,6 +683,7 @@
ServiceFund serviceFund2 = new ServiceFund();
serviceFund2.setId(serviceFund1.getId());
serviceFund2.setUploadStates(2);
+ serviceFund2.setUpdateTime(new Date());
boolean b = serviceFundService.updateById(serviceFund2);
log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
}
--
Gitblit v1.9.3