From c168cfa22deb00ea82a45aa317645a609d3e14ca Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 24 Jun 2025 22:42:56 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentReviewController.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

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 6abc9c6..7ce9588 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
@@ -13,7 +13,6 @@ 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.modules.database.constant.ExperimentReviewProcessType;
 import org.jeecg.modules.database.dto.ExperimentReviewDTO;
 import org.jeecg.modules.database.entity.*;
 import org.jeecg.modules.database.service.*;
@@ -54,8 +53,7 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
     //@AutoLog(value = "试验评定结果-分页列表查询")
     @Operation(summary = "试验评定列表-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<Experiment>> queryPageList(Experiment experiment,
-                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+    public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
         QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
@@ -84,6 +82,19 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
         return Result.OK(review);
     }
 
+    @Operation(summary = "试验评定结果-通过试验id查询")
+    @GetMapping(value = "/queryByExperimentId")
+    public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId) {
+        Experiment experiment = experimentService.getById(experimentId);
+
+        List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId);
+        experiment.setExperimentReviewList(experimentReviewList);
+        if (experiment == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experiment);
+    }
+
     /**
      * 编辑
      *