From 7bae2c55ff2d9c94d30df77ad2dfbc66bb703209 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 九月 2024 17:40:33 +0800
Subject: [PATCH] 电路试验
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 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 d53cc19..163e9c3 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,27 +1,31 @@
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;
import com.yuanchu.mom.service.InsOrderPlanService;
+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;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -38,6 +42,7 @@
private InsOrderFileService insOrderFileService;
private InsProductService insProductService;
+ private InsOrderStateService insOrderStateService;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -73,7 +78,7 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+ @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
@PostMapping("/getReportModel")
@ValueAuth
public Result<?> getReportModel(Integer sampleId) {
@@ -83,8 +88,8 @@
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
- public Result<?> getInsProduct(Integer id, Integer type, String laboratory) {
- return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory));
+ public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
+ return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
}
@ValueClassify("妫�楠屼换鍔�")
@@ -92,6 +97,13 @@
@PostMapping("/upPlanUser")
public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
+ @PostMapping("/upPlanUser2")
+ public Result<?> upPlanUser2(Integer orderId) {
+ return Result.success(insOrderPlanService.upPlanUser2(orderId));
}
@ValueClassify("妫�楠屼换鍔�")
@@ -111,9 +123,16 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser);
+ public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+ }
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+ @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+ public Result<?> isItAllowedToModifyTheCollectedValues() {
+ return Result.success();
}
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@@ -174,4 +193,42 @@
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 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("/deleteInsContext2")
+ @ValueAuth
+ public Result<?> deleteInsContext2(String frequency,Integer productId,String often) {
+ return Result.success(insOrderPlanService.deleteInsContext2(frequency,productId,often));
+ }
+
+ @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));
+ }
}
--
Gitblit v1.9.3