From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
index 5b13ba3..5a31930 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -1,6 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
+import com.ycl.platform.domain.dto.CheckResultExportDTO;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.entity.CheckScore;
@@ -8,6 +9,7 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
+import com.ycl.utils.SecurityUtils;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,13 +90,28 @@
}
/**
- * 瀵煎嚭鑰冩牳绉垎鍒楄〃
+ * 璇︽儏椤靛鍑鸿�冩牳绉垎鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('check:score:export')")
- @Log(title = "瀵煎嚭鑰冩牳绉垎", businessType = BusinessType.EXPORT)
+ @Log(title = "璇︽儏椤靛鍑鸿�冩牳绉垎", businessType = BusinessType.EXPORT)
+ @PostMapping("/detailExport")
+ @PreAuthorize("@ss.hasPermi('check:result:detail:export')")
+ //鍏辩敤鐨勪竴涓柟娉曠敤checkScore鎺ュ弬,new瀵硅薄鐨勬柟寮忛槻鎶ゃ��
+ public void detailExport(HttpServletResponse response, CheckScore checkScore) throws IOException {
+ CheckResultExportDTO exportDTO = new CheckResultExportDTO();
+ exportDTO.setDate(checkScore.getDate());
+ exportDTO.setQuarter(checkScore.getQuarter());
+ exportDTO.setDeptId(checkScore.getDeptId());
+ exportDTO.setId(checkScore.getId());
+ checkScoreService.exportIndex(response,exportDTO);
+ }
+ /**
+ * 鍗＄墖椤靛鍑鸿�冩牳绉垎鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('check:result:export')")
+ @Log(title = "鍗＄墖椤靛鍑鸿�冩牳绉垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
- checkScoreService.exportIndex(response,checkScore);
+ public void export(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
+ checkScoreService.exportIndex(response,exportDTO);
}
// /**
// * 鏂板鑰冩牳绉垎
--
Gitblit v1.8.0