From 0b99371d3e543532608e691e2bdfda3e65e1912c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 10:18:24 +0800
Subject: [PATCH] 工单取图片查询优化
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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 f3e736c..00d8fda 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,7 +9,7 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
-import com.ycl.utils.poi.ExcelUtil;
+import com.ycl.utils.SecurityUtils;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,11 +36,22 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('check:score:list')")
- @GetMapping("/list")
- public AjaxResult list(CheckScore checkScore)
+ @PreAuthorize("@ss.hasPermi('check:score:query')")
+ @PostMapping("/list")
+ public AjaxResult list(@RequestBody CheckScore checkScore)
{
Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreList(checkScore);
+ return success(deptMap);
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鎶樼嚎鍥�
+ */
+ @PreAuthorize("@ss.hasPermi('check:score:chart')")
+ @GetMapping("/chart")
+ public AjaxResult selectCheckScoreChart(CheckScore checkScore)
+ {
+ Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreChart(checkScore);
return success(deptMap);
}
@@ -59,34 +71,47 @@
/**
* 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
*/
- @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)
{
-
return toAjax(checkScoreService.publishCheckScore(checkScoreDTO));
}
/**
- * 瀵煎嚭鑰冩牳绉垎鍒楄〃
+ * 璇︽儏椤靛鍑鸿�冩牳绉垎鍒楄〃
*/
- @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