From 48e207cd11d0e14185d8e7015fb791462f2d601c Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Mon, 5 May 2025 21:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E8=AF=84=E5=AE=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=84=E5=AE=9A=E7=8A=B6=E6=80=81=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/ExperimentReviewStatusEnum.java  | 20 +++++++++++++++
 .../ExperimentReviewController.java           | 25 +++++++++++++++++--
 .../database/entity/ExperimentReview.java     |  7 ++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewStatusEnum.java

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewStatusEnum.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewStatusEnum.java
new file mode 100644
index 0000000..b70e2fd
--- /dev/null
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentReviewStatusEnum.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.database.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ExperimentReviewStatusEnum {
+
+    INIT(1, "待评定"),
+    REVIEWING(2, "评定中"),
+    REVIEW_FINISHED(0, "评定完成"),
+    TEMP_SAVE(5, "暂存")
+
+            ;
+
+
+    final int status;
+    final String description;
+}
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
index 30fab92..44f1812 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
@@ -14,13 +14,18 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.modules.database.constant.ExperimentReviewStatusEnum;
 import org.jeecg.modules.database.entity.ExperimentReview;
 import org.jeecg.modules.database.service.IExperimentReviewService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Arrays;
+import java.util.Date;
 
 /**
  * @Description: 试验评定
@@ -36,6 +41,9 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
     @Autowired
     private IExperimentReviewService experimentReviewService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 分页列表查询
      *
@@ -68,14 +76,27 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
     @Operation(summary = "试验评定-添加")
     @RequiresPermissions("database:experiment_review:add")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody ExperimentReview experimentReview) {
+    public Result<String> add(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) {
+        String username = JwtUtil.getUserNameByToken(request);
+        SysUser userByName = userService.getUserByName(username);
+
+        experimentReview.setReviewStatus(ExperimentReviewStatusEnum.REVIEW_FINISHED.getStatus());
+        experimentReview.setUpdateTime( new Date());
+        experimentReview.setUpdateBy(userByName.getId());
         experimentReviewService.save(experimentReview);
         return Result.OK("添加成功！");
     }
 
     @Operation(summary = "试验评定-暂存")
     @PostMapping(value = "/temporarySave")
-    public Result<String> temporarySave(@RequestBody ExperimentReview experimentReview) {
+    public Result<String> temporarySave(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) {
+        String username = JwtUtil.getUserNameByToken(request);
+        SysUser userByName = userService.getUserByName(username);
+
+        experimentReview.setUpdateTime(new Date());
+        experimentReview.setCreateBy(userByName.getId());
+        experimentReview.setUpdateBy(userByName.getId());
+        experimentReview.setReviewStatus(ExperimentReviewStatusEnum.REVIEWING.getStatus());
         experimentReviewService.saveOrUpdate(experimentReview);
         return Result.OK("暂存成功！");
     }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
index 43f7036..e7d884b 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
@@ -85,4 +85,11 @@ public class ExperimentReview implements Serializable {
     @Excel(name = "评审结果", width = 15)
     @Schema(description = "评审结果(合格/不合格)")
     private String reviewResult;
+
+    /**
+     * 评审状态
+     */
+    @Excel(name = "评审状态", width = 15)
+    @Schema(description = "评审状态")
+    private int reviewStatus;
 }