diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java
index 84d665f..bef9494 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java
@@ -36,8 +36,8 @@ public class SysEvaluationAnswerController extends BaseController {
     /**
      * 查询量测回答记录列表
      */
-    @SaCheckPermission("evaluation:answer:list")
-    @GetMapping("/list")
+    @SaCheckPermission("evaluation:answer:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysEvaluationAnswerVo> list(SysEvaluationAnswerBo bo, PageQuery pageQuery) {
         return sysEvaluationAnswerService.queryPageList(bo, pageQuery);
     }
@@ -60,43 +60,9 @@ public class SysEvaluationAnswerController extends BaseController {
      */
     @SaCheckPermission("evaluation:answer:query")
     @GetMapping("/{id}")
-    public R<SysEvaluationAnswerVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+    public R<SysEvaluationAnswerVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
         return R.ok(sysEvaluationAnswerService.queryById(id));
     }
 
-//    /**
-//     * 新增量测回答记录
-//     */
-//    @SaCheckPermission("evaluation:answer:add")
-//    @Log(title = "量测回答记录", businessType = BusinessType.INSERT)
-//    @RepeatSubmit()
-//    @PostMapping()
-//    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysEvaluationAnswerBo bo) {
-//        return toAjax(sysEvaluationAnswerService.insertByBo(bo));
-//    }
 
-//    /**
-//     * 修改量测回答记录
-//     */
-//    @SaCheckPermission("scale:evaluationAnswer:edit")
-//    @Log(title = "量测回答记录", businessType = BusinessType.UPDATE)
-//    @RepeatSubmit()
-//    @PutMapping()
-//    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysEvaluationAnswerBo bo) {
-//        return toAjax(sysEvaluationAnswerService.updateByBo(bo));
-//    }
-
-//    /**
-//     * 删除量测回答记录
-//     *
-//     * @param ids 主键串
-//     */
-//    @SaCheckPermission("scale:evaluationAnswer:remove")
-//    @Log(title = "量测回答记录", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{ids}")
-//    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-//                          @PathVariable Long[] ids) {
-//        return toAjax(sysEvaluationAnswerService.deleteWithValidByIds(List.of(ids), true));
-//    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java
index 47d1d15..4c02aa5 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java
@@ -36,8 +36,8 @@ public class SysEvaluationConclusionController extends BaseController {
     /**
      * 查询量测结果列表
      */
-    @SaCheckPermission("scale:evaluationConclusion:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:evaluationConclusion:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysEvaluationConclusionVo> list(SysEvaluationConclusionBo bo, PageQuery pageQuery) {
         return sysEvaluationConclusionService.queryPageList(bo, pageQuery);
     }
@@ -61,8 +61,16 @@ public class SysEvaluationConclusionController extends BaseController {
     @SaCheckPermission("scale:evaluationConclusion:query")
     @GetMapping("/{id}")
     public R<SysEvaluationConclusionVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                                @PathVariable Long id) {
         return R.ok(sysEvaluationConclusionService.queryById(id));
     }
 
+    /**
+     * 获取量测结果列表
+     */
+    @SaCheckPermission("scale:evaluationConclusion:query")
+    @GetMapping("/list")
+    public R<List<SysEvaluationConclusionVo>> getList(SysEvaluationConclusionBo bo) {
+        return R.ok(sysEvaluationConclusionService.queryList(bo));
+    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java
index b4aa9c4..cc86750 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java
@@ -36,8 +36,8 @@ public class SysEvaluationRecordController extends BaseController {
     /**
      * 查询量测记录列表
      */
-    @SaCheckPermission("evaluation:record:list")
-    @GetMapping("/list")
+    @SaCheckPermission("evaluation:record:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysEvaluationRecordVo> list(SysEvaluationRecordBo bo, PageQuery pageQuery) {
         return sysEvaluationRecordService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java
index abcd840..785306d 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysInterveneRecordController.java
@@ -40,8 +40,8 @@ public class SysInterveneRecordController extends BaseController {
     /**
      * 查询干预记录列表
      */
-    @SaCheckPermission("scale:intervene:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:intervene:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysInterveneRecordVo> list(SysInterveneRecordBo bo, PageQuery pageQuery) {
         return sysInterveneRecordService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java
index d759276..2968176 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java
@@ -36,8 +36,8 @@ public class SysScaleAnswerController extends BaseController {
     /**
      * 查询选项信息列表
      */
-    @SaCheckPermission("scale:answer:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:answer:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleAnswerVo> list(SysScaleAnswerBo bo, PageQuery pageQuery) {
         return sysScaleAnswerService.queryPageList(bo, pageQuery);
     }
@@ -64,39 +64,4 @@ public class SysScaleAnswerController extends BaseController {
                                      @PathVariable Long answerId) {
         return R.ok(sysScaleAnswerService.queryById(answerId));
     }
-
-//    /**
-//     * 新增选项信息
-//     */
-//    @SaCheckPermission("scale:answer:add")
-//    @Log(title = "选项信息", businessType = BusinessType.INSERT)
-//    @RepeatSubmit()
-//    @PostMapping()
-//    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysScaleAnswerBo bo) {
-//        return toAjax(sysScaleAnswerService.insertByBo(bo));
-//    }
-
-//    /**
-//     * 修改选项信息
-//     */
-//    @SaCheckPermission("scale:answer:edit")
-//    @Log(title = "选项信息", businessType = BusinessType.UPDATE)
-//    @RepeatSubmit()
-//    @PutMapping()
-//    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysScaleAnswerBo bo) {
-//        return toAjax(sysScaleAnswerService.updateByBo(bo));
-//    }
-
-//    /**
-//     * 删除选项信息
-//     *
-//     * @param answerIds 主键串
-//     */
-//    @SaCheckPermission("scale:answer:remove")
-//    @Log(title = "选项信息", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{answerIds}")
-//    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-//                          @PathVariable Long[] answerIds) {
-//        return toAjax(sysScaleAnswerService.deleteWithValidByIds(List.of(answerIds), true));
-//    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
index 1eea6b4..914ece8 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleController.java
@@ -40,8 +40,8 @@ public class SysScaleController extends BaseController {
     /**
      * 查询心理测评量列表
      */
-    @SaCheckPermission("scale:info:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:info:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleVo> list(SysScaleBo bo, PageQuery pageQuery) {
         return sysScaleService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
index a6e51a8..2443155 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
@@ -40,8 +40,8 @@ public class SysScaleFactorController extends BaseController {
     /**
      * 查询测评因子列表
      */
-    @SaCheckPermission("scale:factor:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:factor:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleFactorVo> list(SysScaleFactorBo bo, PageQuery pageQuery) {
         return sysScaleFactorService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java
index 88cecbe..53c23d0 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorRangeController.java
@@ -1,26 +1,27 @@
 package org.dromara.scale.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
-import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
-import org.dromara.scale.service.ISysScaleFactorRangeService;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.scale.domain.bo.SysScaleFactorRangeBo;
+import org.dromara.scale.domain.vo.SysScaleFactorRangeVo;
+import org.dromara.scale.service.ISysScaleFactorRangeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 因子分段
@@ -39,8 +40,8 @@ public class SysScaleFactorRangeController extends BaseController {
     /**
      * 查询因子分段列表
      */
-    @SaCheckPermission("scale:scaleFactorRange:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:scaleFactorRange:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleFactorRangeVo> list(SysScaleFactorRangeBo bo, PageQuery pageQuery) {
         return sysScaleFactorRangeService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFormulaController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFormulaController.java
index 43e7d14..d7cde63 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFormulaController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFormulaController.java
@@ -40,8 +40,8 @@ public class SysScaleFormulaController extends BaseController {
     /**
      * 查询测评量公式列表
      */
-    @SaCheckPermission("scale:formula:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:formula:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleFormulaVo> list(SysScaleFormulaBo bo, PageQuery pageQuery) {
         return sysScaleFormulaService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
index 2cb95c6..5f2adcc 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
@@ -38,8 +38,8 @@ public class SysScalePublishController extends BaseController {
     /**
      * 查询量表发布列表
      */
-    @SaCheckPermission("scale:publish:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:publish:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScalePublishVo> list(SysScalePublishBo bo, PageQuery pageQuery) {
         return sysScalePublishService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
index 0a414dd..b06451b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleQuestionController.java
@@ -40,8 +40,8 @@ public class SysScaleQuestionController extends BaseController {
     /**
      * 查询量问题内容列表
      */
-    @SaCheckPermission("scale:question:list")
-    @GetMapping("/list")
+    @SaCheckPermission("scale:question:pageList")
+    @GetMapping("/pageList")
     public TableDataInfo<SysScaleQuestionVo> list(SysScaleQuestionBo bo, PageQuery pageQuery) {
         return sysScaleQuestionService.queryPageList(bo, pageQuery);
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java
index f120586..5051a71 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java
@@ -14,6 +14,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.scale.domain.bo.SysWarnRecordBo;
+import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
 import org.dromara.scale.domain.vo.SysWarnRecordVo;
 import org.dromara.scale.service.ISysWarnRecordService;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +39,8 @@ public class SysWarnRecordController extends BaseController {
     /**
      * 查询预警记录列表
      */
+    @SaCheckPermission("sacle:warn:pageList")
+    @GetMapping("/pageList")
     @SaCheckPermission("scale:warn:list")
     @GetMapping("/list")
     public TableDataInfo<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) {
@@ -63,7 +66,7 @@ public class SysWarnRecordController extends BaseController {
     @SaCheckPermission("scale:warn:query")
     @GetMapping("/{warnId}")
     public R<SysWarnRecordVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long warnId) {
+                                      @PathVariable Long warnId) {
         return R.ok(sysWarnRecordService.queryById(warnId));
     }
 
@@ -78,4 +81,9 @@ public class SysWarnRecordController extends BaseController {
         return toAjax(sysWarnRecordService.updateByBo(bo));
     }
 
+    @SaCheckPermission("sacle:warn:query")
+    @GetMapping("/evaluation/record")
+    public R<List<SysEvaluationRecordVo>> getEvaluationRecordList(@NotNull(message = "主键不能为空") Long warnId) {
+        return R.ok(sysWarnRecordService.queryConclusionListByWarnId(warnId));
+    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java
index 96454ab..c2d2c81 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java
@@ -54,5 +54,7 @@ public class SysEvaluationRecordVo implements Serializable {
     @ExcelProperty(value = "td_scale_publish表主键")
     private Long batchNo;
 
+    private String scaleName;
+
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java
index 7a3a34a..81ec894 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java
@@ -1,9 +1,12 @@
 package org.dromara.scale.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.scale.domain.SysWarnRecord;
-import org.dromara.scale.domain.vo.SysWarnRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.scale.domain.SysWarnRecord;
+import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
+import org.dromara.scale.domain.vo.SysWarnRecordVo;
+
+import java.util.List;
 
 /**
  * 预警记录Mapper接口
@@ -14,4 +17,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 @Mapper
 public interface SysWarnRecordMapper extends BaseMapperPlus<SysWarnRecord, SysWarnRecordVo> {
 
+    List<SysEvaluationRecordVo> selectEvaluationRecordListByWarnId(Long warnId);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java
index 6113e56..8e0f83e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java
@@ -5,7 +5,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.bo.SysEvaluationAnswerBo;
 import org.dromara.scale.domain.vo.SysEvaluationAnswerVo;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -31,18 +30,5 @@ public interface ISysEvaluationAnswerService {
      */
     List<SysEvaluationAnswerVo> queryList(SysEvaluationAnswerBo bo);
 
-    /**
-     * 新增量测回答记录
-     */
-    Boolean insertByBo(SysEvaluationAnswerBo bo);
 
-    /**
-     * 修改量测回答记录
-     */
-    Boolean updateByBo(SysEvaluationAnswerBo bo);
-
-    /**
-     * 校验并批量删除量测回答记录信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java
index 4e746fa..a052954 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java
@@ -4,6 +4,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysWarnRecord;
 import org.dromara.scale.domain.bo.SysWarnRecordBo;
+import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
 import org.dromara.scale.domain.vo.SysWarnRecordVo;
 
 import java.util.List;
@@ -41,4 +42,6 @@ public interface ISysWarnRecordService {
      */
     Boolean updateByBo(SysWarnRecordBo bo);
 
+    List<SysEvaluationRecordVo> queryConclusionListByWarnId(Long warnId);
+
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java
index 256ddde..72af5d0 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysEvaluationAnswer;
@@ -14,7 +13,6 @@ import org.dromara.scale.mapper.SysEvaluationAnswerMapper;
 import org.dromara.scale.service.ISysEvaluationAnswerService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -65,45 +63,4 @@ public class SysEvaluationAnswerServiceImpl implements ISysEvaluationAnswerServi
         return lqw;
     }
 
-    /**
-     * 新增量测回答记录
-     */
-    @Override
-    public Boolean insertByBo(SysEvaluationAnswerBo bo) {
-        SysEvaluationAnswer add = MapstructUtils.convert(bo, SysEvaluationAnswer.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改量测回答记录
-     */
-    @Override
-    public Boolean updateByBo(SysEvaluationAnswerBo bo) {
-        SysEvaluationAnswer update = MapstructUtils.convert(bo, SysEvaluationAnswer.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(SysEvaluationAnswer entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除量测回答记录
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java
index fbd636e..c85a132 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java
@@ -9,11 +9,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysEvaluationConclusion;
 import org.dromara.scale.domain.bo.SysEvaluationConclusionBo;
 import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
-import org.dromara.scale.mapper.*;
+import org.dromara.scale.mapper.SysEvaluationConclusionMapper;
 import org.dromara.scale.service.ISysEvaluationConclusionService;
 import org.springframework.stereotype.Service;
 
-import java.math.MathContext;
 import java.util.List;
 
 /**
@@ -26,25 +25,8 @@ import java.util.List;
 @Service
 public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclusionService {
 
-    private final MathContext mathContext = new MathContext(2);
-
     private final SysEvaluationConclusionMapper baseMapper;
 
-    private final SysScaleMapper scaleMapper;
-
-    private final SysEvaluationAnswerMapper evaluationAnswerMapper;
-
-    private final SysEvaluationRecordMapper recordMapper;
-
-    private final SysScaleQuestionMapper scaleQuestionMapper;
-
-    private final SysScaleAnswerMapper scaleAnswerMapper;
-
-    private final SysScaleFactorMapper scaleFactorMapper;
-
-    private final SysScaleFactorRangeMapper scaleFactorRangeMapper;
-
-
     /**
      * 查询量测结果
      */
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java
index d0339e6..1800c1c 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java
@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysWarnRecord;
 import org.dromara.scale.domain.bo.SysWarnRecordBo;
+import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
 import org.dromara.scale.domain.vo.SysWarnRecordVo;
 import org.dromara.scale.mapper.SysWarnRecordMapper;
 import org.dromara.scale.service.ISysWarnRecordService;
@@ -102,5 +103,8 @@ public class SysWarnRecordServiceImpl implements ISysWarnRecordService {
         //TODO 做一些数据校验,如唯一约束
     }
 
-
+    @Override
+    public List<SysEvaluationRecordVo> queryConclusionListByWarnId(Long warnId) {
+        return baseMapper.selectEvaluationRecordListByWarnId(warnId);
+    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
index 88771ff..bd9d966 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.SysWarnRecordMapper">
-
+    <select id="selectEvaluationRecordListByWarnId" resultType="org.dromara.scale.domain.vo.SysEvaluationRecordVo">
+        select er.*,
+               s.scale_name
+        from sys_warn_record wr
+                 left join sys_evaluation_record er on wr.batch_no = er.batch_no and wr.user_id = er.user_id
+                 left join sys_scale s on er.scale_id = s.scale_id
+        where wr.warn_id = #{warnId}
+    </select>
 </mapper>