统计修改

zhanghua

2023-03-18 87a395a6024278594a0a80d25a24ba4ca5993513

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java

@@ -113,7 +113,6 @@
        }
        return CommonResult.failed("request parameter is null");
    }*/

    @ApiOperation(value = "查询违规违建")
    @GetMapping("/query")
    @ApiImplicitParams({
@@ -131,8 +130,8 @@
    })
    public CommonResult searchViolation(@RequestParam Integer size,
                                        @RequestParam Integer current,
                                        @RequestParam Integer state,
                                        @RequestParam(required = false) Integer type,
                                        @RequestParam(required = false) Integer state,
                                        @RequestParam Integer type,
                                        @RequestParam(required = false) Integer resource,
                                        @RequestParam(required = false) String code,
                                        @RequestParam(required = false) String categoryBig,
@@ -140,21 +139,18 @@
                                        @RequestParam(required = false) Integer street,
                                        @RequestParam(required = false) String site,
                                        @RequestParam(required = false) String startTime,
                                        @RequestParam(required = false) String endTime ){
        if (state != null) {
                                        @RequestParam(required = false) String endTime,
                                        @RequestParam(required = false) Integer violationsTypeId) {

            Page<Object> queryList;
            Integer violation = 1;
            Integer illegalBuilding = 2;
            if (type == violation) {
                queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime);
            } else if (type == illegalBuilding) {
        if (type == 1) {
            queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
        } else if (type == 2) {
                queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
            } else {
                return CommonResult.failed("bad request url");
            }
            return CommonResult.success(queryList);
        }
        return CommonResult.failed("request parameter is null");
    }

    /**