From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 0772bc0..0036898 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -8,8 +8,10 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.dto.InsProductResultDto;
+import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
+import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -115,8 +117,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode, String note,String term) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,note,term);
+ public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
+ int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@@ -134,6 +136,20 @@
Map<String, Object> param2 = JSON.parseObject(param, Map.class);
insOrderPlanService.saveInsContext(param2,num);
return Result.success();
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext2")
+ @ValueAuth
+ public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
+ return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
+ }
+
+ @ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext3")
+ @ValueAuth
+ public Result<?> saveInsContext3(@RequestBody InsProductResult insProductResult) {
+ return Result.success(insOrderPlanService.saveInsContext3(insProductResult));
}
@ValueAuth
@@ -184,13 +200,6 @@
@PostMapping("/jumpTeam")
public Result<?> jumpTeam(@RequestBody InsOrderState insOrderState) {
return Result.success(insOrderStateService.jumpTeam(insOrderState));
- }
-
- @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
- @PostMapping("/saveInsContext2")
- @ValueAuth
- public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
- return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
}
@ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
--
Gitblit v1.9.3