From ec5a6ede3f88abebdf7a280744ea762757f310aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 126 +++++++++++++++++++++++------------------
1 files changed, 71 insertions(+), 55 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 a9d5283..f3e736c 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,8 @@
package com.ycl.platform.controller;
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;
@@ -13,13 +15,15 @@
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;
/**
- * 鑰冩牳绉垎鏄庣粏Controller
+ * 鑰冩牳绉垎Controller
*
* @author ruoyi
- * @date 2024-04-01
+ * @date 2024-04-22
*/
@RestController
@RequestMapping("/check/score")
@@ -29,70 +33,82 @@
private ICheckScoreService checkScoreService;
/**
- * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+ * 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:score:list')")
+ @PreAuthorize("@ss.hasPermi('check:score:list')")
@GetMapping("/list")
- public TableDataInfo list(CheckScore checkScore)
+ public AjaxResult list(CheckScore checkScore)
+ {
+ Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreList(checkScore);
+ return success(deptMap);
+ }
+
+ /**
+ * 鍖哄幙璇︽儏鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('check:score:list')")
+ @GetMapping("/detail")
+ public TableDataInfo detail(CheckScore checkScore)
{
startPage();
- List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
- return getDataTable(list);
+ List<CheckScore> page = checkScoreService.page(checkScore);
+ return getDataTable(page);
+ }
+
+
+ /**
+ * 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('check:score:query')")
+ @GetMapping(value = "/detail/index")
+ public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
+ {
+
+ return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
}
/**
- * 瀵煎嚭鑰冩牳绉垎鏄庣粏鍒楄〃
+ * 鍙戝竷鑰冩牳绉垎
*/
- @PreAuthorize("@ss.hasPermi('system:score:export')")
- @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.EXPORT)
+ @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)
- {
- List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
- ExcelUtil<CheckScore> util = new ExcelUtil<CheckScore>(CheckScore.class);
- util.exportExcel(response, list, "鑰冩牳绉垎鏄庣粏鏁版嵁");
+ public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
+ checkScoreService.exportIndex(response,checkScore);
}
+// /**
+// * 鏂板鑰冩牳绉垎
+// */
+// @PreAuthorize("@ss.hasPermi('check:score:add')")
+// @Log(title = "鑰冩牳绉垎", businessType = BusinessType.INSERT)
+// @PostMapping
+// public AjaxResult add(@RequestBody CheckScore checkScore)
+// {
+// return toAjax(checkScoreService.insertCheckScore(checkScore));
+// }
- /**
- * 鑾峰彇鑰冩牳绉垎鏄庣粏璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:score:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(checkScoreService.selectCheckScoreById(id));
- }
+// /**
+// * 鍒犻櫎鑰冩牳绉垎
+// */
+// @PreAuthorize("@ss.hasPermi('check:score:remove')")
+// @Log(title = "鑰冩牳绉垎", businessType = BusinessType.DELETE)
+// @DeleteMapping("/{ids}")
+// public AjaxResult remove(@PathVariable Long[] ids)
+// {
+// return toAjax(checkScoreService.deleteCheckScoreByIds(ids));
+// }
- /**
- * 鏂板鑰冩牳绉垎鏄庣粏
- */
- @PreAuthorize("@ss.hasPermi('system:score:add')")
- @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody CheckScore checkScore)
- {
- return toAjax(checkScoreService.insertCheckScore(checkScore));
- }
- /**
- * 淇敼鑰冩牳绉垎鏄庣粏
- */
- @PreAuthorize("@ss.hasPermi('system:score:edit')")
- @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody CheckScore checkScore)
- {
- return toAjax(checkScoreService.updateCheckScore(checkScore));
- }
-
- /**
- * 鍒犻櫎鑰冩牳绉垎鏄庣粏
- */
- @PreAuthorize("@ss.hasPermi('system:score:remove')")
- @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(checkScoreService.deleteCheckScoreByIds(ids));
- }
}
--
Gitblit v1.8.0