From cb7d99d810f2356096b67fbccd3fac556e638d83 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 22 八月 2024 11:22:56 +0800
Subject: [PATCH] feat：查询条件优化
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 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 f001700..4b2e20e 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
@@ -2,16 +2,18 @@
import annotation.Log;
import com.ycl.platform.domain.dto.CheckScoreDTO;
+import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.entity.CheckScore;
import com.ycl.platform.service.ICheckScoreService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import enumeration.BusinessType;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -31,7 +33,7 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('check:score:list')")
+// @PreAuthorize("@ss.hasPermi('check:score:list')")
@GetMapping("/list")
public AjaxResult list(CheckScore checkScore)
{
@@ -40,9 +42,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)
{
@@ -53,27 +66,36 @@
/**
- * 鑾峰彇鑰冩牳绉垎璇︾粏淇℃伅
+ * 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('check:score:query')")
- @GetMapping(value = "/detail/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+// @PreAuthorize("@ss.hasPermi('check:score:query')")
+ @GetMapping(value = "/detail/index")
+ public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
{
- return success(checkScoreService.selectCheckScoreById(id));
+
+ return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
}
/**
* 鍙戝竷鑰冩牳绉垎
*/
- @PreAuthorize("@ss.hasPermi('check:score:edit')")
- @Log(title = "鑰冩牳绉垎", businessType = BusinessType.UPDATE)
+// @PreAuthorize("@ss.hasPermi('check:score:edit')")
+ @Log(title = "鍙戝竷鑰冩牳绉垎", businessType = BusinessType.UPDATE)
@PutMapping("/publish")
public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
{
-
return toAjax(checkScoreService.publishCheckScore(checkScoreDTO));
}
+ /**
+ * 瀵煎嚭鑰冩牳绉垎鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('check:score:export')")
+ @Log(title = "瀵煎嚭鑰冩牳绉垎", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
+ checkScoreService.exportIndex(response,checkScore);
+ }
// /**
// * 鏂板鑰冩牳绉垎
// */
@@ -97,16 +119,4 @@
// }
-// /**
-// * 瀵煎嚭鑰冩牳绉垎鍒楄〃
-// */
-// @PreAuthorize("@ss.hasPermi('check:score:export')")
-// @Log(title = "鑰冩牳绉垎", businessType = BusinessType.EXPORT)
-// @PostMapping("/export")
-// public void export(HttpServletResponse response, CheckScore checkScore)
-// {
-// List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
-// ExcelUtil<CheckScore> util = new ExcelUtil<CheckScore>(CheckScore.class);
-// util.exportExcel(response, list, "鑰冩牳绉垎鏄庣粏鏁版嵁");
-// }
}
--
Gitblit v1.8.0