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

修改list和pageList

This commit is contained in:
jiangzhe 2024-04-18 10:36:32 +08:00
parent 44c7c3aa2e
commit 801a6a0a46
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java
View File

@ -42,10 +42,16 @@ public class SysScaleFactorController extends BaseController {
*/ */
@SaCheckPermission("scale:factor:pageList") @SaCheckPermission("scale:factor:pageList")
@GetMapping("/pageList") @GetMapping("/pageList")
public TableDataInfo<SysScaleFactorVo> list(SysScaleFactorBo bo, PageQuery pageQuery) { public TableDataInfo<SysScaleFactorVo> pageList(SysScaleFactorBo bo, PageQuery pageQuery) {
return sysScaleFactorService.queryPageList(bo, pageQuery); return sysScaleFactorService.queryPageList(bo, pageQuery);
} }
@GetMapping("/list")
public R<List<SysScaleFactorVo>> list(SysScaleFactorBo bo) {
List<SysScaleFactorVo> list = sysScaleFactorService.queryList(bo);
return R.ok(list);
}
/** /**
* 导出测评因子列表 * 导出测评因子列表
*/ */
@ -65,7 +71,7 @@ public class SysScaleFactorController extends BaseController {
@SaCheckPermission("scale:factor:query") @SaCheckPermission("scale:factor:query")
@GetMapping("/{factorId}") @GetMapping("/{factorId}")
public R<SysScaleFactorVo> getInfo(@NotNull(message = "主键不能为空") public R<SysScaleFactorVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long factorId) { @PathVariable Long factorId) {
return R.ok(sysScaleFactorService.queryById(factorId)); return R.ok(sysScaleFactorService.queryById(factorId));
} }

3
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java
View File

@ -3,7 +3,6 @@ package org.dromara.scale.controller.web;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser;
/** /**
* <p>TODO<p> * <p>TODO<p>
* *