From e05875fa75605595b192fca04e598598cb2f2931 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 九月 2024 17:45:07 +0800
Subject: [PATCH] 代码优化+检验下单新增字段下发至对象
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 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 9b23ba0..724cb63 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
@@ -1,11 +1,13 @@
package com.yuanchu.mom.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
+import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.service.InsOrderFileService;
@@ -13,6 +15,7 @@
import com.yuanchu.mom.service.InsOrderStateService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.InsProductResultVo;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +24,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -75,13 +79,6 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
- @PostMapping("/getReportModel")
- @ValueAuth
- public Result<?> getReportModel(Integer sampleId) {
- return Result.success(insOrderPlanService.getReportModel(sampleId));
- }
-
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
@@ -106,7 +103,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
@@ -135,9 +132,9 @@
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
@ValueAuth
- public Result<?> saveInsContext(String param) {
+ public Result<?> saveInsContext(String param,Integer num) {
Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveInsContext(param2);
+ insOrderPlanService.saveInsContext(param2,num);
return Result.success();
}
@@ -184,17 +181,42 @@
return Result.success(insProductService.write(insProductDto));
}
- @ValueAuth
- @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
- @PostMapping("/temCycle")
- public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
- return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
- }
-
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎻掗槦鎿嶄綔")
@PostMapping("/jumpTeam")
- public Result<?> jumpTeam(@RequestBody List<InsOrderState> insOrderStates) {
- return Result.success(insOrderStateService.updateBatchById(insOrderStates));
+ 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 = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
+ @PostMapping("/deleteInsContext")
+ @ValueAuth
+ public Result<?> deleteInsContext(@RequestBody InsProductResultVo insProductResultVo) {
+ return Result.success(insOrderPlanService.deleteInsContext(insProductResultVo));
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐐瑰嚮妫�楠岄�夋嫨鐗堟湰")
+ @PostMapping("/chooseVersion")
+ @ValueAuth
+ public Result<?> chooseVersion(Integer orderStateId,Integer version) {
+ InsOrderState orderState = new InsOrderState();
+ orderState.setId(orderStateId);
+ orderState.setVersion(version);
+ return Result.success(insOrderStateService.updateById(orderState));
+ }
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @PostMapping("/getInsProduct2")
+ @ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
+ public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
+ return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num));
+ }
+
}
--
Gitblit v1.9.3