From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java |   76 +++++++++++++------------------------
 1 files changed, 27 insertions(+), 49 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..7c23eea 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,20 +1,15 @@
 package com.ycl.platform.controller;
 
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.domain.form.CalculateReportBackfillForm;
+import com.ycl.platform.domain.query.CalculateReportQuery;
 import com.ycl.platform.service.CalculateReportService;
 import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CalculateReportForm;
-import com.ycl.platform.domain.query.CalculateReportQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -32,25 +27,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 +34,32 @@
         return calculateReportService.page(query);
     }
 
+    @PostMapping("/backfill/money")
+    @ApiOperation(value = "鍥炲～鎵ｆ閲戦", notes = "鍥炲～鎵ｆ閲戦")
+    @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();
-//    }
+    @PutMapping("/status/{reportId}")
+    @ApiOperation(value = "淇敼鍙戝竷鐘舵��", notes = "淇敼鍙戝竷鐘舵��")
+    @PreAuthorize("@ss.hasPermi('system:calculate:report:status')")
+    public Result updatePublishStatus(@PathVariable("reportId") Long reportId) {
+        return calculateReportService.updatePublishStatus(reportId);
+    }
 
-//    @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);
-//    }
-
+    @PostMapping("/export")
+    @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭")
+    @PreAuthorize("@ss.hasPermi('system:calculate:report:export')")
+    public void export(Integer contractId, HttpServletResponse response) {
+        calculateReportService.export(contractId, response);
+    }
 
 }

--
Gitblit v1.8.0