修改查询分页处理

wl

2022-09-20 4e260f558428dd81c4dd8981a965cdaa0ebf12de

 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,