From 1d14ba39daf0422199c44b5b2ffc67d2364b2be2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 07 四月 2024 17:24:50 +0800
Subject: [PATCH] 工单状态完善
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java | 158 ++++++++++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 74 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
index 0ca4a47..78bbeec 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
@@ -1,88 +1,98 @@
package com.ycl.platform.controller;
-import com.ycl.platform.domain.form.ManualScoreForm;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.CheckResultService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckResultForm;
-import com.ycl.platform.domain.query.CheckResultQuery;
-import lombok.RequiredArgsConstructor;
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckResult;
+import com.ycl.platform.service.ICheckResultService;
+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;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
- * 鑰冩牳缁撴灉 鍓嶇鎺у埗鍣�
+ * 鑰冩牳缁撴灉Controller
*
- * @author xp
- * @since 2024-03-07
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "鑰冩牳缁撴灉", tags = "鑰冩牳缁撴灉绠＄悊")
@RestController
-@RequestMapping("/check-result")
-public class CheckResultController {
+@RequestMapping("/check/result")
+public class CheckResultController extends BaseController
+{
+ @Autowired
+ private ICheckResultService checkResultService;
- private final CheckResultService checkResultService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) CheckResultForm form) {
- return checkResultService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) CheckResultForm form) {
- return checkResultService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return checkResultService.removeById(id);
- }
-
- @PutMapping("/publish/{id}")
- @ApiOperation(value = "ID鍙戝竷", notes = "ID鍙戝竷")
- public Result publishById(@PathVariable("id") String id) {
- return checkResultService.publishById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return checkResultService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody CheckResultQuery query) {
- return checkResultService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return checkResultService.detail(id);
- }
-
+ /**
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return checkResultService.all();
+ public TableDataInfo list(CheckResult checkResult)
+ {
+ startPage();
+ List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
+ return getDataTable(list);
}
- @PostMapping("/manual-score")
- @ApiOperation(value = "浜哄伐鎵撳垎", notes = "浜哄伐鎵撳垎")
- public Result manualScore(@RequestBody ManualScoreForm form) {
- return checkResultService.manualScore(form);
+ /**
+ * 瀵煎嚭鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:export')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckResult checkResult)
+ {
+ List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
+ ExcelUtil<CheckResult> util = new ExcelUtil<CheckResult>(CheckResult.class);
+ util.exportExcel(response, list, "鑰冩牳缁撴灉鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkResultService.selectCheckResultById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:add')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckResult checkResult)
+ {
+ return toAjax(checkResultService.insertCheckResult(checkResult));
+ }
+
+ /**
+ * 淇敼鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:edit')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckResult checkResult)
+ {
+ return toAjax(checkResultService.updateCheckResult(checkResult));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:remove')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkResultService.deleteCheckResultByIds(ids));
}
}
--
Gitblit v1.8.0