From c17fcbe2e051a0fb3baf9ba4ca2a72ac33cc9ad0 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Wed, 23 Oct 2024 17:24:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/controller/ScaleController.java     | 19 +++++++++----------
 .../scale/service/ISysScaleService.java       |  5 +++--
 .../service/impl/SysScaleServiceImpl.java     |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
index c6111cb..09b7245 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
@@ -1,20 +1,19 @@
 package org.dromara.scale.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-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.excel.utils.ExcelUtil;
 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.SysScale;
 import org.dromara.scale.domain.bo.SysScaleBo;
 import org.dromara.scale.domain.vo.SysScaleVo;
 import org.dromara.scale.service.ISysScaleService;
@@ -49,13 +48,13 @@ public class ScaleController extends BaseController {
     /**
      * 导出心理测评量列表
      */
-    @SaCheckPermission("scale:info:export")
-    @Log(title = "心理测评量", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(SysScaleBo bo, HttpServletResponse response) {
-        List<SysScaleVo> list = sysScaleService.queryList(bo);
-        ExcelUtil.exportExcel(list, "心理测评量", SysScaleVo.class, response);
-    }
+//    @SaCheckPermission("scale:info:export")
+//    @Log(title = "心理测评量", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(SysScaleBo bo, HttpServletResponse response) {
+//        List<SysScaleVo> list = sysScaleService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "心理测评量", SysScaleVo.class, response);
+//    }
 
     /**
      * 查询所有量表
@@ -63,7 +62,7 @@ public class ScaleController extends BaseController {
      * @return
      */
     @GetMapping("/findAll")
-    public R<List<SysScaleVo>> findAll(SysScaleBo bo) {
+    public R<List<SysScale>> findAll(SysScaleBo bo) {
         return R.ok(sysScaleService.queryList(bo));
     }
 
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
index b527c88..48f0b36 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
@@ -2,6 +2,7 @@ package org.dromara.scale.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.scale.domain.SysScale;
 import org.dromara.scale.domain.bo.SysScaleBo;
 import org.dromara.scale.domain.vo.SysScaleVo;
 
@@ -38,7 +39,7 @@ public interface ISysScaleService {
     /**
      * 查询心理测评量列表
      */
-    List<SysScaleVo> queryList(SysScaleBo bo);
+    List<SysScale> queryList(SysScaleBo bo);
 
     /**
      * 新增心理测评量
@@ -55,5 +56,5 @@ public interface ISysScaleService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    Map<String,List<SysScaleVo>> queryWxMapList(String scaleType);
+    Map<String, List<SysScaleVo>> queryWxMapList(String scaleType);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
index 604dca2..7465db4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
@@ -144,10 +144,10 @@ public class SysScaleServiceImpl implements ISysScaleService {
      * 查询心理测评量列表
      */
     @Override
-    public List<SysScaleVo> queryList(SysScaleBo bo) {
+    public List<SysScale> queryList(SysScaleBo bo) {
         LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo);
         lqw.orderByDesc(SysScale::getPublishNums);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectList(lqw);
     }
 
     private LambdaQueryWrapper<SysScale> buildQueryWrapper(SysScaleBo bo) {