From 022b17044ab6bb284fd6313da91d1d1dfb2d5079 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 03 六月 2024 13:20:42 +0800
Subject: [PATCH] update

---
 assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssInvestigationController.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssInvestigationController.java b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssInvestigationController.java
index 8fadb5b..2d644a8 100644
--- a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssInvestigationController.java
+++ b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/AssInvestigationController.java
@@ -7,10 +7,14 @@
 import com.gkhy.assess.system.domain.AssInvestigation;
 import com.gkhy.assess.system.service.AssInvestigationService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -31,7 +35,7 @@
     @ApiOperation(value = "根据id获取现场勘验记录表详情")
     @GetMapping("/detail/{investigationId}")
     public CommonResult investigationDetail(@PathVariable(value = "investigationId") Long investigationId){
-        return CommonResult.success(investigationService.getInvestigationByProjectId(investigationId));
+        return CommonResult.success(investigationService.getInvestigationById(investigationId));
     }
 
     @ApiOperation(value = "根据项目id获取现场勘验记录表详情")
@@ -44,7 +48,18 @@
     @ApiOperation(value = "创建现场勘验记录表")
     @PostMapping("/add")
     public CommonResult addInvestigation(@Validated @RequestBody AssInvestigation investigation){
-        return CommonResult.success(investigationService.addInvestigation(investigation, RequestSourceEnum.WEB.getCode()));
+        return CommonResult.success(investigationService.addInvestigation(investigation));
+    }
+
+    @RepeatSubmit
+    @ApiOperation(value = "现场勘验项目状态流转")
+    @PostMapping("/doProcess")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", name = "projectId", dataType = "long", required = true, value = "项目id"),
+    })
+    public CommonResult doProcess(@RequestBody Map map){
+        investigationService.doInvestigationProcess(map);
+        return CommonResult.success();
     }
 
     @RepeatSubmit
@@ -54,13 +69,6 @@
         return CommonResult.success(investigationService.editInvestigation(investigation));
     }
 
-//    @RepeatSubmit
-//    @ApiOperation(value = "现场勘验记录项目状态流转")
-//    @PostMapping("/doProcess")
-//    public CommonResult doProcess(@RequestBody Long projectId){
-//        investigationService.doInvestigationProcess(projectId);
-//        return CommonResult.success();
-//    }
 
 
 }

--
Gitblit v1.9.2