From c88146106b1ec8dba94a078d946a5bfbf7d1527f Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sun, 13 Jul 2025 00:17:58 +0800
Subject: [PATCH] update

---
 .../modules/database/controller/ExperimentController.java  | 4 ++--
 .../modules/database/mapper/ExperimentRatingMapper.java    | 7 +++++++
 .../modules/database/service/IExperimentRatingService.java | 2 ++
 .../database/service/impl/ExperimentRatingServiceImpl.java | 5 +++++
 .../database/service/impl/ExperimentServiceImpl.java       | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 4461325..ada1379 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -506,12 +506,12 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
                     ExperimentRating data = experimentRatingList.get(k);
 
                     // 设置 rateUser1, rateUser2, rateUser3
-                    Field rateUserField = dto.getClass().getDeclaredField("rateUser" + (i + 1));
+                    Field rateUserField = dto.getClass().getDeclaredField("rateUser" + (k + 1));
                     rateUserField.setAccessible(true);
                     rateUserField.set(dto, data.getRateUserName());
 
                     // 设置 rateScore1, rateScore2, rateScore3
-                    Field rateScoreField = dto.getClass().getDeclaredField("rateScore" + (i + 1));
+                    Field rateScoreField = dto.getClass().getDeclaredField("rateScore" + (k + 1));
                     rateScoreField.setAccessible(true);
                     rateScoreField.set(dto, data.getTotalScore());
                 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java
index 0cf11e2..420ed3d 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java
@@ -1,8 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.database.entity.ExperimentRating;
 
+import java.util.List;
+
 /**
  * @Description: 试验评分
  * @Author: jeecg-boot
@@ -11,4 +15,7 @@ import org.jeecg.modules.database.entity.ExperimentRating;
  */
 public interface ExperimentRatingMapper extends BaseMapper<ExperimentRating> {
 
+    @Select("SELECT * FROM experiment_rating where create_time=(select max(create_time) from experiment_rating where "
+            + "experiment_id=#{experimentId}) and experiment_id=#{experimentId} order by create_time")
+    List<ExperimentRating> getLatestRating(@Param("experimentId") String experimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java
index 5cef160..fa091f9 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java
@@ -14,4 +14,6 @@ import java.util.List;
 public interface IExperimentRatingService extends IService<ExperimentRating> {
 
     List<ExperimentRating> getByExperimentId(String experimentId);
+
+    List<ExperimentRating> getLatestRating(String experimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRatingServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRatingServiceImpl.java
index afff8c9..a0031b7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRatingServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRatingServiceImpl.java
@@ -23,4 +23,9 @@ public class ExperimentRatingServiceImpl extends ServiceImpl<ExperimentRatingMap
         List<ExperimentRating> list = list(new LambdaQueryWrapper<ExperimentRating>().eq(ExperimentRating::getExperimentId, experimentId));
         return list;
     }
+
+    @Override
+    public List<ExperimentRating> getLatestRating(String experimentId) {
+        return baseMapper.getLatestRating(experimentId);
+    }
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
index 3b1a0c8..fdc611e 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
@@ -138,7 +138,7 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
         } else {
             experiment.setExperimentReportList(new ArrayList<>());
         }
-        List<ExperimentRating> ratingList = experimentRatingService.getByExperimentId(experiment.getId());
+        List<ExperimentRating> ratingList = experimentRatingService.getLatestRating(experiment.getId());
         if (CollUtil.isNotEmpty(ratingList)) {
             ratingList.forEach(this::fetchExperimentRateDetail);
             experiment.setExperimentRatingList(ratingList);