From 36e5600e3497d97b42376c5f096d85891f1ad94b Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期二, 30 四月 2024 16:50:12 +0800 Subject: [PATCH] 改为连表查询 --- ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java | 53 +++++++++++++++-------------------------------------- 1 files changed, 15 insertions(+), 38 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java index 04330b7..b2ce714 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java @@ -1,5 +1,6 @@ package com.ycl.platform.controller; +import com.ycl.platform.domain.form.CalculateReportBackfillForm; import com.ycl.system.domain.group.Update; import com.ycl.system.domain.group.Add; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,25 +33,6 @@ private final CalculateReportService calculateReportService; -// @PostMapping -// @ApiOperation(value = "娣诲姞", notes = "娣诲姞") -// public Result add(@RequestBody @Validated(Add.class) CalculateReportForm form) { -// return calculateReportService.add(form); -// } - -// @PutMapping -// @ApiOperation(value = "淇敼", notes = "淇敼") -// public Result update(@RequestBody @Validated(Update.class) CalculateReportForm form) { -// return calculateReportService.update(form); -// } - - @PutMapping - @ApiOperation(value = "淇敼閲戦", notes = "淇敼閲戦") - @PreAuthorize("@ss.hasPermi('system:calculate:report:edit:money')") - public Result adjustMoney(@RequestBody @Validated(Update.class) CalculateReportForm form) { - return calculateReportService.update(form); - } - @GetMapping("/page") @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") @PreAuthorize("@ss.hasPermi('system:calculate:report:page')") @@ -58,30 +40,25 @@ return calculateReportService.page(query); } + @PostMapping("/backfill/money") + @ApiOperation(value = "鍥炲~鎵f閲戦", notes = "鍥炲~鎵f閲戦") + @PreAuthorize("@ss.hasPermi('system:calculate:report:backfill')") + public Result backfill(@Validated @RequestBody CalculateReportBackfillForm form) { + return calculateReportService.backfill(form); + } + @GetMapping("/{id}") @ApiOperation(value = "璇︽儏", notes = "璇︽儏") @PreAuthorize("@ss.hasPermi('system:calculate:report:detail')") - public Result detail(@PathVariable("id") String id) { + public Result detail(@PathVariable("id") Long id) { return calculateReportService.detail(id); } -// @GetMapping("/list") -// @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") -// public Result list() { -// return calculateReportService.all(); -// } - -// @DeleteMapping("/{id}") -// @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") -// public Result removeById(@PathVariable("id") String id) { -// return calculateReportService.removeById(id); -// } -// -// @DeleteMapping("/batch") -// @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") -// public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { -// return calculateReportService.remove(ids); -// } - + @PutMapping("/status/{reportId}") + @ApiOperation(value = "淇敼鍙戝竷鐘舵��", notes = "淇敼鍙戝竷鐘舵��") + @PreAuthorize("@ss.hasPermi('system:calculate:report:status')") + public Result updatePublishStatus(@PathVariable("reportId") Long reportId) { + return calculateReportService.updatePublishStatus(reportId); + } } -- Gitblit v1.8.0