zhanghua
2023-03-10 9bfd0f697d407902d9d80d95e5c23943a556b79f
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
@@ -66,13 +66,13 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByType((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
        page.setTotal(unlawfulByType.size());
        page.setTotal(unlawfulService.getTotalByType(startTime, endTime1));
        page.setRecords(unlawfulByType);
        return CommonResult.success(page);
    }
@@ -91,12 +91,12 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
        page.setTotal(unlawfulByType.size());
        page.setTotal(unlawfulService.getTotalBySite(startTime, endTime1));
        page.setRecords(unlawfulByType);
        return CommonResult.success(page);
    }
@@ -115,12 +115,11 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
        page.setTotal(unlawfulByType.size());
        page.setTotal(unlawfulService.getTotalByTime(startTime, endTime1));
        page.setRecords(unlawfulByType);
        return CommonResult.success(page);
    }
@@ -139,12 +138,12 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByStreet((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
        page.setTotal(unlawfulByType.size());
        page.setTotal(unlawfulService.getTotalByStreet(startTime, endTime1));
        page.setRecords(unlawfulByType);
        return CommonResult.success(page);
    }
@@ -208,6 +207,14 @@
        EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
    }
    @PostMapping("/export/unlawful/time")
    @ApiOperation("按报警点位统计方式-导出")
    public void exportTime(HttpServletResponse response) {
        List<UnlawfulDto> unlawfulBySiteExport = unlawfulService.getUnlawfulByTimeExport();
        String sheetName = "按报警点位统计方式";
        EasyExcelUtils.export(response, sheetName, UnlawfulDto.class, unlawfulBySiteExport);
    }
    /*@PostMapping("/export/shop")
    @ApiOperation("门前三包-导出")
    public void exportShop(HttpServletResponse response) {