From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 3 +++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 6ad96bb..556c138 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -445,6 +445,7 @@
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
serviceFundflow.setFundtype(2);
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setApplytype(serviceFund.getApplytype());
serviceFundflow.setFlowconclusion(CheckFlag);
serviceFundflow.setFlowcontent("閫氳繃");
@@ -504,6 +505,7 @@
serviceFundflow.setFundtype(2);
serviceFundflow.setApplytype(serviceFund.getApplytype());
serviceFundflow.setFlowconclusion(CheckFlag);
+ serviceFundflow.setCheckTime(new Date());
if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) {
serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
} else {
@@ -1801,6 +1803,7 @@
serviceFundflow.setUpdateBy(serviceProcessVO.getCheckusername());
serviceFundflow.setCheckusername(serviceProcessVO.getCheckusername());
serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setUpdateTime(new Date());
serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
serviceFundflow.setFlowconclusion(StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) ? Integer.valueOf(serviceProcessVO.getFlowconclusion()) : null);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 33f2c24..b8f9d63 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -380,6 +380,7 @@
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
serviceFundflow.setFundtype(1);
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setApplytype("0");
serviceFundflow.setFlowconclusion(CheckFlag);
serviceFundflow.setFlowcontent("閫氳繃");
@@ -436,6 +437,7 @@
serviceFundflow.setFundid(serviceReimbursement.getId());
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setFundtype(1);
serviceFundflow.setApplytype("0");
serviceFundflow.setFlowconclusion(CheckFlag);
@@ -768,7 +770,7 @@
formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", "");
formmain_1209.put("鍗″彿-浣滃簾", "");
formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursementShared.getZffs());
- formmain_1209.put("缁勯暱", serviceReimbursementShared.getManagername());
+ formmain_1209.put("缁勯暱", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getManagername()));
formmain_1209.put("瀹℃壒浜哄憳", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getFinancechecher()));
formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursementShared.getRiqi());
formmain_1209.put("涓婁紶闄勪欢", "");
--
Gitblit v1.9.3