From 3ae364164cb9d85acce0b53a1ba5c70a80991308 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 03 七月 2024 22:21:49 +0800
Subject: [PATCH] 温度循环+报告英文换行+检验只有一项的设备查询+光纤配置报告换页+温度湿度
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 a8a3b82..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 {
@@ -69,6 +73,13 @@
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("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
@@ -90,7 +101,7 @@
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
@@ -114,7 +125,7 @@
return Result.success();
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃")
@PostMapping("/getFileList")
public Result<?> getFileList(@RequestBody Map<String, Object> data) throws Exception {
@@ -138,6 +149,7 @@
return Result.success(insOrderFileService.removeById(id));
}
+ @ValueAuth
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "涓嬭浇闄勪欢")
@PostMapping("/downFile")
@@ -148,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