From ae29f1b7da8a405a358f5d71150b60a504af5f3a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 18:24:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 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 e7deb39..1d6ab7c 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
@@ -60,7 +60,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- if (StringUtils.isNotBlank(serviceFundShared.getCxrjyj())) {
+ if (serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
String[] split = serviceFundShared.getCxrjyj().split("&");
String phone = serviceFundShared.getPhone();
@@ -83,16 +83,22 @@
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
serviceFund.setZffs(serviceFundShared.getZffs());
- if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
- serviceFund.setOpochecker(serviceFundShared.getOpochecker());
- }
if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
}
if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
}
-
+ if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
+ }
+ serviceFund.setRiqi(serviceFundShared.getRiqi());
boolean b = serviceFundService.updateById(serviceFund);
log.info("鏇存柊serviceFund閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -149,6 +155,10 @@
serviceFundflow.setApplytype(null);
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+
+ serviceFundflow.setFlowcontent("宸蹭粯娆� : " + serviceFundShared.getZffs());
+ serviceFundflow.setId(null);
fundflowService.save(serviceFundflow);
//灏嗗鎵圭姸鎬佹敼鎴�1
serviceFundSharedService.updateById(serviceFundShared);
@@ -265,7 +275,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ if (serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
String phone = serviceReimbursementShared.getPhone();
String[] split = serviceReimbursementShared.getCxrjyj().split("&");
@@ -291,14 +301,22 @@
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
- if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
- serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
- }
+ serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
+
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
}
boolean b = serviceReimbursementService.updateById(serviceReimbursement);
log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
@@ -359,6 +377,9 @@
serviceReimbursementShared.setSpjg(1);
fundflowService.save(serviceFundflow);
+ serviceFundflow.setFlowcontent("宸蹭粯娆� : " + serviceReimbursementShared.getZffs());
+ serviceFundflow.setId(null);
+ fundflowService.save(serviceFundflow);
serviceReimbursementSharedService.updateById(serviceReimbursementShared);
} else if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg().equals("1")) {
@@ -382,6 +403,7 @@
//鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+
serviceReimbursementService.updateById(reimbursement);
//灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
--
Gitblit v1.9.3