From 2c16ba7f4cdfedf4ec05395e20caf9c87f2b5101 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 09 八月 2023 18:15:50 +0800
Subject: [PATCH] 修改funddetail文件上传

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   11 ++++++++++-
 1 files changed, 10 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..732e3f3 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,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);
@@ -291,6 +295,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 +364,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 +390,7 @@
                         //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
                         if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
                             reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+
                             serviceReimbursementService.updateById(reimbursement);
 
                             //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑

--
Gitblit v1.9.3