From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，
---
ycl-server/src/main/java/com/ycl/platform/controller/CalculateReportController.java | 27 +++++++++++++++++++--------
1 files changed, 19 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..7fe05da 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,35 @@
return calculateReportService.backfill(form);
}
- @GetMapping("/{id}")
+ @GetMapping("/{contractId}/{whichYear}")
@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) {
+ CalculateReportQuery query = new CalculateReportQuery();
+ query.setContractId(contractId);
+ query.setWhichYear(whichYear);
+ 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 contractId, HttpServletResponse response) {
+ calculateReportService.export(whichYear,whichMonth,contractId, response);
}
}
--
Gitblit v1.8.0