From e700e89f85e58747b57fc0d7e1fd30f3483aacca Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 九月 2024 16:05:57 +0800
Subject: [PATCH] 检验任务历史记录
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 724cb63..9b551c6 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
@@ -10,10 +10,7 @@
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.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
import com.yuanchu.mom.vo.Result;
@@ -39,6 +36,7 @@
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
+ private InsOrderUserService insOrderUserService;
private InsOrderFileService insOrderFileService;
@@ -117,8 +115,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+ 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);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@@ -212,11 +210,25 @@
return Result.success(insOrderStateService.updateById(orderState));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
+ @PostMapping("/getInsOrderUserList")
+ @ApiOperation("鏌ョ湅妫�楠屽巻鍙插垪琛�")
+ public Result<?> getInsOrderUserList(Integer insOrderStateId) {
+ return Result.success(insOrderPlanService.getInsOrderUserList(insOrderStateId));
+ }
+
+ @ValueAuth
@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));
}
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鎵爜鎶ユ")
+ @PostMapping("/scanInsOrderState")
+ public Result scanInsOrderState(String sonLaboratory,String sampleCode) {
+ return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode));
+ }
+
}
--
Gitblit v1.9.3