From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
index c1dcd82..69f1f59 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
@@ -38,10 +38,9 @@
@GetMapping("/page")
@ApiOperation(value = "列表", notes = "传入实体类参数")
- public R<IPage<DangerReport>> pageList(@RequestParam Map<String, Object> dr, Query query) {
- QueryWrapper<DangerReport> queryWrapper = Condition.getQueryWrapper(dr,DangerReport.class);
- IPage<DangerReport> pagelist = dangerReportService.page(Condition.getPage(query),queryWrapper);
- return R.data(pagelist);
+ public R<IPage<DangerReportVO>> pageList(DangerReportVO dangerReportVO, Query query) {
+ IPage<DangerReportVO> page = dangerReportService.selectPage(Condition.getPage(query),dangerReportVO);
+ return R.data(page);
}
@GetMapping("/all")
--
Gitblit v1.9.3