blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-07-22 7789318b8a9ef6535a0b776c5c0bfe2a8eb98e2b 
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java


@@ -1,6 +1,7 @@


package com.example.erp.controller.pp;




import cn.dev33.satoken.annotation.SaCheckPermission;


import cn.hutool.core.date.DateTime;


import com.example.erp.common.Constants;


import com.example.erp.common.Result;


import com.example.erp.dto.pp.*;


@@ -25,6 +26,7 @@


import java.time.LocalDate;


import java.util.List;


import java.util.Map;


import java.util.concurrent.ExecutionException;




@RestController


@Api(value = "生产报表controller", tags = {"生产报表操作接口"})


@@ -38,7 +40,7 @@




    //流程卡进度


    @ApiOperation("流程卡进度")


    @SaCheckPermission("processCardProgress.search")


    @SaCheckPermission("selectOrder.search")


    @PostMapping("/processCardProgress/{orderId}")


    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {


        return Result.seccess(reportService.processCardProgressSv(orderId, columns));


@@ -90,8 +92,8 @@


    public Result damageReport(


            @PathVariable Integer pageNum,


            @PathVariable Integer pageSize,


            @PathVariable Date selectTime1,


            @PathVariable Date selectTime2,


            @PathVariable String selectTime1,


            @PathVariable String selectTime2,


            @RequestBody DamageReportDTO damageReportDTO) {


        return Result.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));




@@ -179,8 +181,8 @@


    public Result teamOutput(


            @PathVariable Integer pageNum,


            @PathVariable Integer pageSize,


            @PathVariable Date selectTime1,


            @PathVariable Date selectTime2,


            @PathVariable String selectTime1,


            @PathVariable String selectTime2,


            @PathVariable String selectProcesses,


            @RequestBody TeamOutputDTO teamOutputDTO) {


        return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));


@@ -287,4 +289,19 @@


        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字


        DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");


    }




    @ApiOperation("在制品汇总报表")


    @SaCheckPermission("workInProgress.search")


    @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")


    public Result workInProgressCombination(


            @PathVariable Integer pageNum,


            @PathVariable Integer pageSize,


            @PathVariable String orderId,


            @PathVariable String inputProject,


            @PathVariable String selectProcesses,


            @PathVariable String optionVal,


            @RequestBody WorkInProgressDTO workInProgressDTO) {


        return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));




    }


}