From 260abb2da843238575832df8f6ac7a61afec57a6 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 1 Apr 2025 21:54:53 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentReportController.java      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index eb00aa4..0b1c251 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -269,9 +269,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PROOFREAD_PASS)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setProofreaderMemo(experimentReport.getMemo());
-                report.setProofreaderTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
             }
+            report.setProofreaderMemo(experimentReport.getMemo());
+            report.setProofreaderTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
             report.setStatus(requestStatus);
         }
         //待审核
@@ -281,10 +281,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.AUDIT_PASS)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setAuditorMemo(experimentReport.getMemo());
-                report.setAuditorTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
-
             }
+            report.setAuditorMemo(experimentReport.getMemo());
+            report.setAuditorTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
             report.setStatus(requestStatus);
         }
 
@@ -295,9 +294,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PASSED)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setConfirmerMemo(experimentReport.getMemo());
-                report.setConfirmerTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
             }
+            report.setConfirmerMemo(experimentReport.getMemo());
+            report.setConfirmerTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
             report.setStatus(requestStatus);
         } else {
             return Result.error("实验报告状态异常!");