From 4e260f558428dd81c4dd8981a965cdaa0ebf12de Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 九月 2022 11:57:11 +0800
Subject: [PATCH] 修改查询分页处理
---
ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
index c4ede37..a531ff8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
@@ -3,7 +3,9 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.zf.EnforcelawReport;
@@ -18,18 +20,19 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.stream.Collectors;
/**
* <p>
* 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗� 鍓嶇鎺у埗鍣�
* </p>
*
- * @author lyq
+ * @author wl
* @since 2022-09-14
*/
@RestController
@RequestMapping("/enforcelaw-report")
-@Api(tags = "鎵ф硶绠＄悊锛氳繚瑙勪簨椤瑰缃鐞�")
+@Api(tags = "鍩庡競杩濆缓")
public class EnforcelawReportController extends BaseController {
@Autowired
@@ -42,25 +45,14 @@
@RequestParam(required = false) String community,
@RequestParam(required = false) String status,
@RequestParam(required = false) String partiesName,
- @RequestParam(required = false) String partiesID
+ @RequestParam(required = false) String partiesID,
+ @RequestParam(required = false) Integer current,
+ @RequestParam(required = false) Integer size
) {
- QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
- enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
- }
- if (StringUtils.isNotBlank(community)) {
- enforcelawReportQueryWrapper.eq("community", community);
- }
- if (StringUtils.isNotBlank(status)) {
- enforcelawReportQueryWrapper.eq("status", status);
- }
- if (StringUtils.isNotBlank(partiesName)) {
- enforcelawReportQueryWrapper.eq("partiesName", partiesName);
- }
- if (StringUtils.isNotBlank(partiesID)) {
- enforcelawReportQueryWrapper.eq("partiesID", partiesID);
- }
- return CommonResult.success(enforcelawReportService.list(enforcelawReportQueryWrapper));
+ Page<EnforcelawReport> enforcelawReportPage = new Page<>();
+ enforcelawReportPage.setCurrent(current);
+ enforcelawReportPage.setSize(size);
+ return CommonResult.success(enforcelawReportService.selectPageVo(enforcelawReportPage,startTime,endTime,community,status,partiesName,partiesID));
}
@GetMapping("/search/one")
@ApiOperation("鏌ヨ鍩庡競杩濆缓璇︽儏")
@@ -87,7 +79,7 @@
}
@GetMapping("/download")
- @ApiOperation("鏌ヨ鍩庡競杩濆缓璇︽儏")
+ @ApiOperation("瀵煎嚭")
@SneakyThrows
public void downloadExcel(@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
--
Gitblit v1.8.0