mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
cjw 2024-10-23 17:24:51 +08:00
parent 318a380b4a
commit c17fcbe2e0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScaleController.java
View File

@ -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));
}

5
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
View File

@ -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);
}

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
View File

@ -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) {