Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

lxw

2023-05-17 cc95ea96c89301a181147fb35b7b589d61c80233

 src/main/java/com/whyc/controller/FaultUploadController.java

@@ -28,17 +28,42 @@
        return service.updateConfirm(fault);
    }

    @GetMapping("listPage")
    @ApiOperation(value = "列表分页",notes = "包机组内成员可见")
    public Response listPage(@RequestParam int pageNum,@RequestParam int pageSize){
        return service.listPage(pageNum, pageSize);
    @PostMapping("listPage")
    @ApiOperation(value = "列表分页-组内",notes = "包机组内成员可见")
    public Response listPage(@RequestParam int pageNum,@RequestParam int pageSize,
                             @RequestBody FaultUpload upload){
        return service.listPage(pageNum, pageSize,upload);
    }

    @GetMapping("typeNum")
    @ApiOperation(value = "故障隐患类型统计",notes = "包机组内成员可见")
    public Response getTypeNum(){
        return service.getTypeNum();
    @GetMapping("typeCount")
    @ApiOperation(value = "隐患故障上报类型统计",notes = "timeType:不传-所有,1-本月,2-本季度,3-本年")
    public Response getTypeCount(@RequestParam(required = false) Integer timeType){
        return service.getTypeCount(timeType);
    }

    @PostMapping("listPage2")
    @ApiOperation(value = "列表分页-管理")
    public Response listPage2(@RequestParam int pageNum,@RequestParam int pageSize,
                              @RequestBody FaultUpload upload){
        return service.listPage2(pageNum, pageSize,upload);
    }

    @GetMapping("groupNameCount")
    @ApiOperation(value = "隐患故障上报统计-管理",notes = "timeType:1-本月,2-本季度,3-本年")
    public Response groupNameCount(@RequestParam int timeType){
        return service.groupNameCount(timeType);
    }

    @GetMapping("listOfLastPeriod")
    @ApiOperation(value = "隐患故障上报进度-最近一周及最近一月-管理",notes = "type:1-最近一周,2-最近一月")
    public Response getListOfLastPeriod(int type){
        return service.getListOfLastPeriod(type);
    }

    @GetMapping("myUploadStatusCount")
    @ApiOperation(value = "我的隐患故障上报状态数量统计")
    public Response getMyUploadStatusCount(){
        return service.getMyUploadStatusCount();
    }

}