From 3d0f75320dc40dde88e98ba75bd5a77963c8a849 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Thu, 24 Oct 2024 14:21:37 +0800
Subject: [PATCH] update

---
 .../ExperimentReportController.java           | 28 ++++++++++---------
 .../database/entity/ExperimentReport.java     |  2 +-
 2 files changed, 16 insertions(+), 14 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 bed4b31..bf6cba1 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
@@ -185,38 +185,40 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         ExperimentReport report = experimentReportService.getById(experimentReport.getId());
         //校对员
         String requestStatus = experimentReport.getStatus();
-        if (StringUtils.equals(report.getProofreader(), sysUser.getId())) {
-            if (!StringUtils.equals(report.getStatus(), "INIT")) {
-                return Result.error("实验报告状态不匹配!");
+        //待校对
+        if (StringUtils.equals(report.getStatus(), "INIT")) {
+            if (!StringUtils.equals(report.getProofreader(), sysUser.getId())) {
+                return Result.error("您无权进行校对!");
             }
             if (!StringUtils.equals(requestStatus, "PROOFREAD_PASS")) {
                 report.setStatus("REJECT");
             }
             report.setStatus(requestStatus);
         }
-        //审核员
-        if (StringUtils.equals(report.getAuditor(), sysUser.getId())) {
-            if (!StringUtils.equals(report.getStatus(), "PROOFREAD_PASS")) {
-                return Result.error("实验报告状态不匹配!");
+        //待审核
+        else if (StringUtils.equals(report.getStatus(), "PROOFREAD_PASS")) {
+            if (!StringUtils.equals(report.getAuditor(), sysUser.getId())) {
+                return Result.error("您无权进行审核!");
             }
-
             if (!StringUtils.equals(requestStatus, "AUDIT_PASS")) {
                 report.setStatus("REJECT");
             }
             report.setStatus(requestStatus);
         }
-        //批准员
-        if (StringUtils.equals(report.getConfirmer(), sysUser.getId())) {
-            if (!StringUtils.equals(report.getStatus(), "AUDIT_PASS")) {
-                return Result.error("实验报告状态不匹配!");
+
+        //待批准
+        else if (StringUtils.equals(report.getStatus(), "AUDIT_PASS")) {
+            if (!StringUtils.equals(report.getConfirmer(), sysUser.getId())) {
+                return Result.error("您无权进行批准!");
             }
             if (!StringUtils.equals(requestStatus, "PASSED")) {
                 report.setStatus("REJECT");
             }
             report.setStatus(requestStatus);
+        } else {
+            return Result.error("实验报告状态异常!");
         }
 
-
         experimentReportService.updateById(report);
 
         return Result.OK("审核成功!");
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 84c18e2..9b8199f 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
@@ -109,6 +109,6 @@ public class ExperimentReport implements Serializable {
      * 状态
      */
     @Excel(name = "状态", width = 15)
-    @Schema(description = "状态(申请中(待校对):INIT,不合格RE:REJECT ,校对通过(待审核)：PROOFREAD_PASS,审核通过(待批准)：AUDIT_PASS，批准通过：PASSED)")
+    @Schema(description = "状态(申请中(待校对):INIT,不合格:REJECT ,校对通过(待审核)：PROOFREAD_PASS,审核通过(待批准)：AUDIT_PASS，批准通过：PASSED)")
     private String status;
 }