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 | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 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 eaae727..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
@@ -1,9 +1,13 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
+import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -42,9 +46,12 @@
@Autowired
private IServiceFundflowruleService iServiceFundflowruleService;
- @Autowired
+ @Autowired
private IServiceFundService serviceFundService;
+
+ @Autowired
+ private ISysUserService sysUserService;
@Autowired
@@ -62,7 +69,7 @@
System.out.println("鎵ц鏃犲弬鏂规硶");
}
- public void checkReportInfo() {
+ public void checkReportInfo() throws ApiException {
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
@@ -74,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);
@@ -85,7 +93,9 @@
serviceFund1.setRecordstatus(-1);
serviceFund1.setBackflowlevel(199);
serviceFundService.updateById(serviceFund1);
- sendMeg(split, phone, serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
+
+ SysUser sysUser = sysUserService.selectUserByUserName(serviceFund1.getUserno());
+ sendMeg(split, sysUser.getPhonenumber(), serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
} else {
//涓嶆槸閫�鍥炵殑鎿嶄綔
if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 0) {
@@ -299,8 +309,8 @@
}
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
-
+ Boolean aBoolean = serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
+ log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}", aBoolean);
//灏咶lowlevel 璁剧疆涓�0;
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
@@ -312,7 +322,9 @@
serviceReimbursement1.setBackflowlevel(199L);
serviceReimbursement1.setRecordstatus(-1);
serviceReimbursementService.updateById(serviceReimbursement1);
- sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
+
+ SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement1.getUserno());
+ sendMeg(split, sysUser.getPhonenumber(), "0", 1, serviceReimbursementShared.getReimid());
} else {
//涓嶆槸閫�鍥炵殑鎿嶄綔
@@ -518,12 +530,12 @@
}
- public void sendMeg(String[] split, String phone, String applyType, Integer fundType, Long fundId) {
+ public void sendMeg(String[] split, String phone, String applyType, Integer fundType, Long fundId) throws ApiException {
//璁板綍鎿嶄綔璁板綍
ServiceFundflow serviceFundflow = new ServiceFundflow();
- serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateBy(split[0]);
serviceFundflow.setCreateTime(new Date());
- serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateBy(split[0]);
serviceFundflow.setUpdateTime(new Date());
serviceFundflow.setCheckusername(split[0]);
serviceFundflow.setFlowcontent(split[2]);
@@ -534,17 +546,17 @@
serviceFundflow.setFundid(fundId);
fundflowService.save(serviceFundflow);
-// ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();
-// ConcurrentHashMap map = new ConcurrentHashMap();
-// map.put("瀹℃壒浜�", split[0]);
-// map.put("瀹℃壒鏃堕棿", split[1]);
-// map.put("鎰忚", split[2]);
-// contentList.add(map);
-// DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
-// dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
-// dingTalkReqVo.setNumber(phone);
-// dingTalkReqVo.setContents(contentList);
-// dingTalkService.sendNotification(dingTalkReqVo);
+ ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
+ ConcurrentHashMap map = new ConcurrentHashMap();
+ map.put("瀹℃壒浜猴細", split[0]);
+ map.put("瀹℃壒鏃堕棿锛�", split[1]);
+ map.put("鎰忚锛�", split[2]);
+ contentList.add(map);
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
+ dingTalkReqVo.setNumber(phone);
+ dingTalkReqVo.setContents(contentList);
+ dingTalkService.sendNotification(dingTalkReqVo);
}
private ReentrantLock lock = new ReentrantLock();
@@ -628,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);
@@ -671,10 +683,12 @@
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);
}
} catch (Exception e) {
+ e.printStackTrace();
ServiceFund serviceFund2 = new ServiceFund();
serviceFund2.setId(serviceFund1.getId());
serviceFund2.setUploadStates(1);
--
Gitblit v1.9.3