From 23adbd6fd679e293c4c8118713b9e1e8b0a463bb Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期三, 17 七月 2024 16:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 2c9c5b4..406831b 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
@@ -5,9 +5,11 @@
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.pojo.InsOrderFile;
import com.yuanchu.mom.service.InsOrderFileService;
import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -35,6 +37,8 @@
private InsOrderFileService insOrderFileService;
+ private InsProductService insProductService;
+
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
@@ -45,7 +49,7 @@
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "妫�楠屽崟璇︽儏-浠诲姟鍒囨崲")
@PostMapping("/inspectionOrderDetailsTaskSwitching")
public Result inspectionOrderDetailsTaskSwitching(@RequestBody Map<String, Object> data) throws Exception {
@@ -67,6 +71,13 @@
@PostMapping("/doInsOrder")
public Result<?> doInsOrder(Integer id, String laboratory) {
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
+ }
+
+ @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+ @PostMapping("/getReportModel")
+ @ValueAuth
+ public Result<?> getReportModel(Integer sampleId) {
+ return Result.success(insOrderPlanService.getReportModel(sampleId));
}
@ValueAuth
@@ -149,4 +160,18 @@
map.put("fileUrl", insOrderFile.getFileUrl());
return Result.success(map);
}
+
+ @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+ @PostMapping("/write")
+ @ValueAuth
+ public Result<?> write(@RequestBody InsProductDto insProductDto) {
+ 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));
+ }
}
--
Gitblit v1.9.3