From 3df04e32e4190bfe8a74998f19fedbbfa9747f29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 05:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 bdcb0ec..5b13ba3 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
@@ -8,7 +8,6 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
-import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +34,7 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:list')")
+ @PreAuthorize("@ss.hasPermi('check:score:query')")
@GetMapping("/list")
public AjaxResult list(CheckScore checkScore)
{
@@ -44,9 +43,20 @@
}
/**
+ * 鏌ヨ鑰冩牳绉垎鎶樼嚎鍥�
+ */
+ @PreAuthorize("@ss.hasPermi('check:score:chart')")
+ @GetMapping("/chart")
+ public AjaxResult selectCheckScoreChart(CheckScore checkScore)
+ {
+ Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreChart(checkScore);
+ return success(deptMap);
+ }
+
+ /**
* 鍖哄幙璇︽儏鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:list')")
+ @PreAuthorize("@ss.hasPermi('check:score:list')")
@GetMapping("/detail")
public TableDataInfo detail(CheckScore checkScore)
{
@@ -59,18 +69,17 @@
/**
* 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('check:score:query')")
+ @PreAuthorize("@ss.hasPermi('check:score:detail')")
@GetMapping(value = "/detail/index")
public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
{
-
return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
}
/**
* 鍙戝竷鑰冩牳绉垎
*/
-// @PreAuthorize("@ss.hasPermi('check:score:edit')")
+ @PreAuthorize("@ss.hasPermi('check:score:publish')")
@Log(title = "鍙戝竷鑰冩牳绉垎", businessType = BusinessType.UPDATE)
@PutMapping("/publish")
public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
@@ -81,7 +90,7 @@
/**
* 瀵煎嚭鑰冩牳绉垎鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:export')")
+ @PreAuthorize("@ss.hasPermi('check:score:export')")
@Log(title = "瀵煎嚭鑰冩牳绉垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
--
Gitblit v1.8.0