From 38c4696da012c26f7e4678fcbad76eb0d73baa46 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 28 七月 2023 20:25:55 +0800
Subject: [PATCH] 从分享表取出riqi给主表加上
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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..3a6cd49 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
@@ -92,7 +92,7 @@
if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
}
-
+ serviceFund.setRiqi(serviceFundShared.getRiqi());
boolean b = serviceFundService.updateById(serviceFund);
log.info("鏇存柊serviceFund閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -149,6 +149,9 @@
serviceFundflow.setApplytype(null);
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+
+ serviceFundflow.setFlowcontent(serviceFundShared.getZffs());
fundflowService.save(serviceFundflow);
//灏嗗鎵圭姸鎬佹敼鎴�1
serviceFundSharedService.updateById(serviceFundShared);
@@ -291,6 +294,7 @@
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
+ serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
}
@@ -359,6 +363,8 @@
serviceReimbursementShared.setSpjg(1);
fundflowService.save(serviceFundflow);
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getZffs());
+ fundflowService.save(serviceFundflow);
serviceReimbursementSharedService.updateById(serviceReimbursementShared);
} else if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg().equals("1")) {
@@ -382,6 +388,7 @@
//鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+
serviceReimbursementService.updateById(reimbursement);
//灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
--
Gitblit v1.9.3