补交

廖井涛

6 天以前 583b80a582f9280a262ee72506d31d1bfa46f734

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java

@@ -40,29 +40,30 @@
        return Result.success(reportService.processCardProgressReportSv(orderId, columns));
    }
    @ApiOperation("流程卡进度汇总")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/processCardProgressCollect/{orderId}")
    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.success(reportService.processCardProgressCollectSv(orderId, columns));
    }

    @ApiOperation("跨工序次破")
    @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
    public Result getOrderReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @PathVariable String reportTime,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
        return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate,reportTime, crossProcessBreakingDTO));

    }

    @ApiOperation("非跨工序次破")
    @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
    public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @PathVariable String reportTime,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
        return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate,reportTime, crossProcessBreakingDTO));

    }

@@ -108,13 +109,14 @@
    }

    @ApiOperation("次破明细报表")
    @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}")
    @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
    public Result damageReport(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable List<String> selectDate,
            @PathVariable String reportTime,
            @RequestBody DamageReportDTO damageReportDTO) {
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate, damageReportDTO));
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate,reportTime, damageReportDTO));

    }

@@ -138,23 +140,23 @@
    }

    @ApiOperation("成品率报表")
    @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
    @PostMapping("/yield/{selectDate}/{selectProcesses}/{reportTime}")
    public Result yield(
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable List<String> selectDate,
            @PathVariable String selectProcesses,
            @PathVariable String reportTime,
            @RequestBody Report report) {
        return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
        return Result.success(reportService.yieldSv(selectDate, selectProcesses,reportTime, report));

    }

    @ApiOperation("成品率工序汇总报表")
    @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
    @PostMapping("/yieldProcess/{selectDate}/{reportTime}")
    public Result yieldProcess(
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable List<String> selectDate,
            @PathVariable String reportTime,
            @RequestBody Report report) {
        return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, report));
        return Result.success(reportService.yieldProcessSv(selectDate,reportTime, report));

    }

@@ -211,21 +213,21 @@
    }
    @ApiOperation("跨工序次破报表导出")
    @PostMapping("/exportCrossProcessBreaking")
    public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
    public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportCrossProcessBreakingSv(dates), "CrossProcessBreaking");
    }

    @ApiOperation("非跨工序次破报表导出")
    @PostMapping("/exportNotCrossProcessBreaking")
    public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
    public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
    }

    @ApiOperation("次破明细报表导出")
    @PostMapping("/exportDamageReport")
    public void exportDamageReport(HttpServletResponse response, @RequestBody Map<String, Object> dates) throws IOException, IllegalAccessException, InstantiationException {
    public void exportDamageReport(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, DamageReportDTO.class, reportService.exportDamageReportSv(dates), "DamageReport");
    }