Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2026-01-29 18:08:48 +08:00
5 changed files with 52 additions and 496 deletions

View File

@ -86,19 +86,35 @@ public class PngApproController {
return R.ok();
}
@ApiOperation(value = "接收站审批")
@PostMapping(value = "/approveJSZ")
@SaCheckPermission("pngApproJsz:approveJsz")
public R approveJSZ(@Valid @RequestBody ApproveDto<UpdateLngPngApproDto> dto){
pngApproService.approveJSZ(dto);
return R.ok();
}
@ApiOperation(value = "接收站审批")
@PostMapping(value = "/batchApproveJSZ")
@SaCheckPermission("pngApproJsz:batchApproveJSZ")
public R batchApproveJSZ(@Valid @RequestBody ApproveDto<UpdateLngPngApproDto> dto){
pngApproService.approveJSZ(dto);
return R.ok();
}
@ApiOperation(value = "管道审批")
@PostMapping(value = "/approveGD")
@SaCheckPermission("pngAppro:approveGD")
@SaCheckPermission("pngPipeAppro:approveGD")
public R approveGD(@Valid @RequestBody ApproveDto<UpdateLngPngApproDto> dto){
pngApproService.approveGD(dto);
return R.ok();
}
@ApiOperation(value = "接收站审批")
@PostMapping(value = "/approveJSZ")
@SaCheckPermission("pngAppro:approveJSZ")
public R approveJSZ(@Valid @RequestBody ApproveDto<UpdateLngPngApproDto> dto){
pngApproService.approveJSZ(dto);
@ApiOperation(value = "管道审批")
@PostMapping(value = "/batchApproveGD")
@SaCheckPermission("pngPipeAppro:batchApproveGD")
public R batchApproveGD(@Valid @RequestBody ApproveDto<UpdateLngPngApproDto> dto){
pngApproService.approveGD(dto);
return R.ok();
}