From 62dc2c8faea3de9d0fc4a763854ab9538a17e1d6 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sun, 4 May 2025 13:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExperimentReportController.java      | 13 +++++++------
 .../modules/database/entity/ExperimentReport.java   |  6 +++---
 2 files changed, 10 insertions(+), 9 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 3e96e24..f4b7677 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
@@ -128,6 +128,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         }
         experimentReport.setReportName("试验报告-" + fileName);
         experimentReportService.save(experimentReport);
+        experimentDocService.generate(experimentId, ExperimentDocType.sybg.getType());
         return Result.OK("添加成功！");
     }
 
@@ -151,9 +152,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         if (!(StringUtils.equals(report.getStatus(), "INIT") || StringUtils.equals(report.getStatus(), "REJECT"))) {
             return Result.error("该报告状态无法进行编辑!");
         }
-        if (StringUtils.equals(report.getStatus(), "REJECT") && StringUtils.isNotBlank(experimentReport.getLastStatus())) {
-            experimentReport.setStatus(experimentReport.getLastStatus());
-        }
+        //if (StringUtils.equals(report.getStatus(), "REJECT") && StringUtils.isNotBlank(experimentReport.getLastStatus())) {
+        //    experimentReport.setStatus(experimentReport.getLastStatus());
+        //}
         experimentReportService.updateById(experimentReport);
         experimentDocService.generate(report.getExperimentId(), ExperimentDocType.sybg.getType());
         return Result.OK("编辑成功!");
@@ -285,7 +286,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PROOFREAD_PASS)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setLastStatus(ExperimentReportStatus.INIT);
+                //report.setLastStatus(ExperimentReportStatus.INIT);
             }
             report.setProofreaderMemo(experimentReport.getMemo());
             report.setProofreaderTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
@@ -298,7 +299,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.AUDIT_PASS)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setLastStatus(ExperimentReportStatus.PROOFREAD_PASS);
+                //report.setLastStatus(ExperimentReportStatus.INIT);
 
             }
             report.setAuditorMemo(experimentReport.getMemo());
@@ -313,7 +314,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             }
             if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PASSED)) {
                 report.setStatus(ExperimentReportStatus.REJECT);
-                report.setLastStatus(ExperimentReportStatus.AUDIT_PASS);
+                //report.setLastStatus(ExperimentReportStatus.PROOFREAD_PASS);
             }
             report.setConfirmerMemo(experimentReport.getMemo());
             report.setConfirmerTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
index 31db19c..fe6b6bf 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
@@ -130,9 +130,9 @@ public class ExperimentReport implements Serializable {
                     "状态(申请中待校对:INIT,不合格:REJECT ,校对通过待审核：PROOFREAD_PASS,审核通过待批准：AUDIT_PASS，批准通过：PASSED)")
     private String status;
 
-    @Excel(name = "上一个状态", width = 15)
-    @Schema(description = "上一个状态")
-    private String lastStatus;
+    //@Excel(name = "上一个状态", width = 15)
+    //@Schema(description = "上一个状态")
+    //private String lastStatus;
 
     @Excel(name = "审批意见", width = 15)
     @Schema(description = "审批意见")