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

This commit is contained in:
Echo 2024-09-28 12:35:34 +08:00
commit b9f15ba600

View File

@ -41,14 +41,12 @@ public class FinancialPaymentController {
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建财务支付子表") @Operation(summary = "创建财务支付子表")
@PreAuthorize("@ss.hasPermission('bpm:financial-payment:create')")
public CommonResult<Long> createFinancialPayment(@Valid @RequestBody FinancialPaymentSaveVO vo) { public CommonResult<Long> createFinancialPayment(@Valid @RequestBody FinancialPaymentSaveVO vo) {
return success(financialPaymentService.createFinancialPayment(vo)); return success(financialPaymentService.createFinancialPayment(vo));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新财务支付管理") @Operation(summary = "更新财务支付管理")
@PreAuthorize("@ss.hasPermission('bpm:financial-payment:update')")
public CommonResult<Boolean> updateFinancialPayment(@Valid @RequestBody FinancialPaymentSaveReqVO updateReqVO) { public CommonResult<Boolean> updateFinancialPayment(@Valid @RequestBody FinancialPaymentSaveReqVO updateReqVO) {
financialPaymentService.updateFinancialPayment(updateReqVO); financialPaymentService.updateFinancialPayment(updateReqVO);
return success(true); return success(true);
@ -71,7 +69,6 @@ public class FinancialPaymentController {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除财务支付管理") @Operation(summary = "删除财务支付管理")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('bpm:financial-payment:delete')")
public CommonResult<Boolean> deleteFinancialPayment(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteFinancialPayment(@RequestParam("id") Long id) {
financialPaymentService.deleteFinancialPayment(id); financialPaymentService.deleteFinancialPayment(id);
return success(true); return success(true);
@ -80,7 +77,6 @@ public class FinancialPaymentController {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得财务支付管理") @Operation(summary = "获得财务支付管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('bpm:financial-payment:query')")
public CommonResult<FinancialPaymentRespVO> getFinancialPayment(@RequestParam("id") Long id) { public CommonResult<FinancialPaymentRespVO> getFinancialPayment(@RequestParam("id") Long id) {
FinancialPaymentDO financialPayment = financialPaymentService.getFinancialPayment(id); FinancialPaymentDO financialPayment = financialPaymentService.getFinancialPayment(id);
FinancialPaymentRespVO vo = BeanUtils.toBean(financialPayment, FinancialPaymentRespVO.class); FinancialPaymentRespVO vo = BeanUtils.toBean(financialPayment, FinancialPaymentRespVO.class);
@ -105,7 +101,6 @@ public class FinancialPaymentController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得财务支付管理分页") @Operation(summary = "获得财务支付管理分页")
@PreAuthorize("@ss.hasPermission('bpm:financial-payment:query')")
public CommonResult<PageResult<FinancialPaymentRespVO>> getFinancialPaymentPage(@Valid FinancialPaymentPageReqVO pageReqVO) { public CommonResult<PageResult<FinancialPaymentRespVO>> getFinancialPaymentPage(@Valid FinancialPaymentPageReqVO pageReqVO) {
PageResult<FinancialPaymentDO> pageResult = financialPaymentService.getFinancialPaymentPage(pageReqVO); PageResult<FinancialPaymentDO> pageResult = financialPaymentService.getFinancialPaymentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FinancialPaymentRespVO.class)); return success(BeanUtils.toBean(pageResult, FinancialPaymentRespVO.class));