From f77a9d8f16bae6b4cf809891f037c038070e81ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 17:12:50 +0800
Subject: [PATCH] 工单,数据中心用户查看数据的权限,合同考核每日,以及导出每日和按月

---
 ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 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 7c23eea..d8713e7 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.entity.CalculateRecord;
 import com.ycl.platform.domain.form.CalculateReportBackfillForm;
 import com.ycl.platform.domain.query.CalculateReportQuery;
 import com.ycl.platform.service.CalculateReportService;
@@ -41,25 +42,36 @@
         return calculateReportService.backfill(form);
     }
 
-    @GetMapping("/{id}")
+    @GetMapping("/{contractId}/{whichYear}/{whichMoth}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
     @PreAuthorize("@ss.hasPermi('system:calculate:report:detail')")
-    public Result detail(@PathVariable("id") Long id) {
-        return calculateReportService.detail(id);
+    public Result detail(@PathVariable("contractId") Integer contractId,@PathVariable("whichYear") Integer whichYear,@PathVariable("whichMoth") Integer whichMoth) {
+        CalculateReportQuery query = new CalculateReportQuery();
+        query.setContractId(contractId);
+        query.setWhichYear(whichYear);
+        query.setWhichMonth(whichMoth);
+        return calculateReportService.detail(query);
     }
 
-    @PutMapping("/status/{reportId}")
+    @PutMapping("/status/{contractId}/{whichYear}")
     @ApiOperation(value = "淇敼鍙戝竷鐘舵��", notes = "淇敼鍙戝竷鐘舵��")
     @PreAuthorize("@ss.hasPermi('system:calculate:report:status')")
-    public Result updatePublishStatus(@PathVariable("reportId") Long reportId) {
-        return calculateReportService.updatePublishStatus(reportId);
+    public Result updatePublishStatus(@PathVariable("contractId") Integer contractId,@PathVariable("whichYear") Integer whichYear) {
+        return calculateReportService.updatePublishStatus(contractId,whichYear);
     }
 
+    @PutMapping("/status/detail/{id}/{status}")
+    @ApiOperation(value = "淇敼鍙戝竷鐘舵��", notes = "淇敼鍙戝竷鐘舵��")
+    @PreAuthorize("@ss.hasPermi('system:calculate:report:status')")
+    public Result updatePublishStatusById(@PathVariable("id") Integer id,@PathVariable("status") String status) {
+
+        return calculateReportService.updatePublishStatusById(id,status);
+    }
     @PostMapping("/export")
     @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭")
     @PreAuthorize("@ss.hasPermi('system:calculate:report:export')")
-    public void export(Integer contractId, HttpServletResponse response) {
-        calculateReportService.export(contractId, response);
+    public void export(Integer whichYear,Integer whichMonth,Integer whichDay,Integer contractId, HttpServletResponse response) {
+        calculateReportService.export(whichYear,whichMonth,whichDay,contractId, response);
     }
 
 }

--
Gitblit v1.8.0