From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java
index ec75e98..fa5f449 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskStepController.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +24,13 @@
 
 /**
  * 瑙嗛宸℃姝ラController
- * 
+ *
  * @author ruoyi
  * @date 2023-05-30
  */
 @RestController
 @RequestMapping("/inspect/step")
-public class ArdVideoInspectTaskStepController extends BaseController
-{
+public class ArdVideoInspectTaskStepController extends BaseController {
     @Autowired
     private IArdVideoInspectTaskStepService ardVideoInspectTaskStepService;
 
@@ -39,8 +39,7 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:step:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ArdVideoInspectTaskStep ardVideoInspectTaskStep)
-    {
+    public TableDataInfo list(ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
         startPage();
         List<ArdVideoInspectTaskStep> list = ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepList(ardVideoInspectTaskStep);
         return getDataTable(list);
@@ -52,8 +51,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:step:export')")
     @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ArdVideoInspectTaskStep ardVideoInspectTaskStep)
-    {
+    public void export(HttpServletResponse response, ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
         List<ArdVideoInspectTaskStep> list = ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepList(ardVideoInspectTaskStep);
         ExcelUtil<ArdVideoInspectTaskStep> util = new ExcelUtil<ArdVideoInspectTaskStep>(ArdVideoInspectTaskStep.class);
         util.exportExcel(response, list, "瑙嗛宸℃姝ラ鏁版嵁");
@@ -64,8 +62,7 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:step:query')")
     @GetMapping(value = "/{taskId}")
-    public AjaxResult getInfo(@PathVariable("taskId") String taskId)
-    {
+    public AjaxResult getInfo(@PathVariable("taskId") String taskId) {
         return success(ardVideoInspectTaskStepService.selectArdVideoInspectTaskStepByTaskId(taskId));
     }
 
@@ -75,8 +72,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:step:add')")
     @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep)
-    {
+    public AjaxResult add(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
         return toAjax(ardVideoInspectTaskStepService.insertArdVideoInspectTaskStep(ardVideoInspectTaskStep));
     }
 
@@ -85,9 +81,18 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:step:edit')")
     @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.UPDATE)
+    @GetMapping("/selectByTaskId")
+    public List selectByTaskId(String taskId) {
+        return ardVideoInspectTaskStepService.selectByTaskId(taskId);
+    }
+
+    /**
+     * 淇敼瑙嗛宸℃姝ラ
+     */
+    @PreAuthorize("@ss.hasPermi('inspect:step:edit')")
+    @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep)
-    {
+    public AjaxResult edit(@RequestBody ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
         return toAjax(ardVideoInspectTaskStepService.updateArdVideoInspectTaskStep(ardVideoInspectTaskStep));
     }
 
@@ -96,9 +101,8 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:step:remove')")
     @Log(title = "瑙嗛宸℃姝ラ", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{taskIds}")
-    public AjaxResult remove(@PathVariable String[] taskIds)
-    {
+    @DeleteMapping("/{taskIds}")
+    public AjaxResult remove(@PathVariable String[] taskIds) {
         return toAjax(ardVideoInspectTaskStepService.deleteArdVideoInspectTaskStepByTaskIds(taskIds));
     }
 }

--
Gitblit v1.9.3