From 9772cfdb668bdb19b2fe342978d9b37ddbdb9558 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 十一月 2022 17:40:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 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 c09fa5b..0bd8575 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
@@ -4,10 +4,11 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
-import com.ycl.service.platform.zf.IEnforcelawReportService;
+import com.ycl.entity.zf.EnforceLawReport;
+import com.ycl.service.zf.IEnforcelawReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -18,14 +19,13 @@
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
@@ -47,33 +47,20 @@
@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).stream().skip((current-1)*size).limit(size).collect(Collectors.toList()));
+ 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("鏌ヨ鍩庡競杩濆缓璇︽儏")
public CommonResult getOne(@RequestParam Integer id) {
- return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforcelawReport>().eq("id", id)));
+ return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforceLawReport>().eq("id", id)));
}
@PostMapping("/add")
@ApiOperation("娣诲姞鍩庡競杩濆缓璇︽儏")
- public CommonResult add(@RequestBody EnforcelawReport enforcelawReport) {
+ public CommonResult add(@RequestBody EnforceLawReport enforcelawReport) {
return CommonResult.success(enforcelawReportService.save(enforcelawReport));
}
@@ -85,7 +72,7 @@
@PutMapping("/update")
@ApiOperation("淇敼鍩庡競杩濆缓璇︽儏")
- public CommonResult modify(@RequestBody EnforcelawReport enforcelawReport) {
+ public CommonResult modify(@RequestBody EnforceLawReport enforcelawReport) {
return CommonResult.success(enforcelawReportService.updateById(enforcelawReport));
}
@@ -99,7 +86,7 @@
@RequestParam(required = false) String partiesName,
@RequestParam(required = false) String partiesID,
HttpServletResponse response) {
- QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
+ QueryWrapper<EnforceLawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
}
@@ -118,6 +105,6 @@
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("鍩庡競杩濆缓" + ".xlsx", "utf-8"));
- EasyExcel.write(response.getOutputStream(), EnforcelawReport.class).sheet("鍒楄〃").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
+ EasyExcel.write(response.getOutputStream(), EnforceLawReport.class).sheet("鍒楄〃").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
}
}
\ No newline at end of file
--
Gitblit v1.8.0