From 2c07f3c1cf4092fd42e3022c56d1bcf8fcc9438e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 15 八月 2023 15:32:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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 1d6ab7c..2da5d94 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
@@ -34,6 +34,9 @@
@Autowired
private IServiceFundSharedService serviceFundSharedService;
+ @Autowired
+ private IServiceFunddetailSharedService serviceFunddetailSharedService;
+
@Autowired
private IServiceFundService serviceFundService;
@@ -60,19 +63,24 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- if (serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
+ if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
String[] split = serviceFundShared.getCxrjyj().split("&");
String phone = serviceFundShared.getPhone();
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
+ ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+ log.info("fundShared鐨処D:{}", serviceFundShared.getId());
+ serviceFunddetailShared.setFundid(serviceFundShared.getId());
+ serviceFunddetailSharedService.delFunddetailShare(serviceFunddetailShared);
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(0);
+ serviceFund1.setFlowlevel(100);
serviceFund1.setDel_flag(0);
+ serviceFund1.setRecordstatus(-1);
serviceFund1.setBackflowlevel(199);
serviceFundService.updateById(serviceFund1);
sendMeg(split, phone, serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
@@ -83,6 +91,9 @@
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
serviceFund.setZffs(serviceFundShared.getZffs());
+ if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
+ serviceFund.setPresident(serviceFundShared.getPresident());
+ }
if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
}
@@ -90,13 +101,13 @@
serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
}
if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
- serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
+ serviceFund.setOfficedirector(serviceFundShared.getOfficedirector());
}
if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
- serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
+ serviceFund.setFinancedirector(serviceFundShared.getFinancedirector());
}
if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
- serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
+ serviceFund.setFinancechecher(serviceFundShared.getFinancechecher());
}
serviceFund.setRiqi(serviceFundShared.getRiqi());
boolean b = serviceFundService.updateById(serviceFund);
@@ -275,9 +286,13 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- if (serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
String phone = serviceReimbursementShared.getPhone();
- String[] split = serviceReimbursementShared.getCxrjyj().split("&");
+ String[] split = null;
+ log.info("serviceReimbursementShared.getCxrjyj(): {}", serviceReimbursementShared.getCxrjyj());
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ split = serviceReimbursementShared.getCxrjyj().split("&");
+ }
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
@@ -287,7 +302,7 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
- serviceReimbursement1.setFlowlevel(0L);
+ serviceReimbursement1.setFlowlevel(100L);
serviceReimbursement1.setDelFlag(0);
serviceReimbursement1.setBackflowlevel(199L);
serviceReimbursement1.setRecordstatus(-1);
@@ -302,7 +317,10 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
-
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
+ serviceReimbursement.setPresident(serviceReimbursementShared.getPresident());
+ }
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
}
@@ -310,13 +328,13 @@
serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
+ serviceReimbursement.setOfficedirector(serviceReimbursementShared.getOfficedirector());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
+ serviceReimbursement.setFinancedirector(serviceReimbursementShared.getFinancedirector());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
+ serviceReimbursement.setFinancechecher(serviceReimbursementShared.getFinancechecher());
}
boolean b = serviceReimbursementService.updateById(serviceReimbursement);
log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
@@ -510,17 +528,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, 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);
}
}
--
Gitblit v1.9.3