From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:47:48 +0800 Subject: [PATCH] OSD加标签 --- ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 73 +++++++++++++++++++++++++----------- 1 files changed, 50 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..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,17 +1,22 @@ 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; import com.ycl.platform.service.ICheckScoreService; 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; 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,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); } @@ -53,27 +69,50 @@ /** - * 鑾峰彇鑰冩牳绉垎璇︾粏淇℃伅 + * 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅 */ - @PreAuthorize("@ss.hasPermi('check:score:query')") - @GetMapping(value = "/detail/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) + @PreAuthorize("@ss.hasPermi('check:score:detail')") + @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:publish')") + @Log(title = "鍙戝竷鑰冩牳绉垎", businessType = BusinessType.UPDATE) @PutMapping("/publish") public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO) { - return toAjax(checkScoreService.publishCheckScore(checkScoreDTO)); } + /** + * 璇︽儏椤靛鍑鸿�冩牳绉垎鍒楄〃 + */ + @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, CheckResultExportDTO exportDTO) throws IOException { + checkScoreService.exportIndex(response,exportDTO); + } // /** // * 鏂板鑰冩牳绉垎 // */ @@ -97,16 +136,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