shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-02 18:48:33 +08:00
parent f1b95235d8
commit 2f918497c3
9 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
View File

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.Report;
import com.ruoyi.cai.dto.admin.vo.ReportAdminVo;
import com.ruoyi.cai.service.ReportService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +42,8 @@ public class ReportController extends BaseController {
*/
@SaCheckPermission("cai:report:list")
@GetMapping("/list")
public TableDataInfo<Report> list(Report bo, PageQuery pageQuery) {
Page<Report> page = reportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<ReportAdminVo> list(ReportAdminVo bo, PageQuery pageQuery) {
Page<ReportAdminVo> page = reportService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}