From 3fdea1ab6ab545de0a25573318ecd838de3be576 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 15:54:13 +0800
Subject: [PATCH] feat: 1.检验任务查询优化 2.模板时间和地点保存
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 48acce4..cbce3a2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -9,6 +9,10 @@
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.SaveOrderDevicesDto;
+import com.ruoyi.inspect.dto.SaveTemplateContextDto;
+import com.ruoyi.inspect.dto.VerifyPlanDto;
+import com.ruoyi.inspect.dto.WriteInspectionConditionDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -93,8 +97,8 @@
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell, Integer userId) {
- return Result.success(insOrderPlanService.rawMaterialVerifyPlan(orderId, laboratory, type, tell, userId));
+ public Result<?> verifyPlan(@RequestBody VerifyPlanDto verifyPlanDto) {
+ return Result.success(insOrderPlanService.rawMaterialVerifyPlan(verifyPlanDto));
}
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@@ -106,16 +110,35 @@
@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, Boolean registerInsResults) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, registerInsResults);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
- Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
- insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
+ insOrderPlanService.saveInsContext(saveInsContextDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鎸夋ā鏉垮潗鏍囦繚瀛樻柊鑱氬師濮嬭褰�")
+ @PostMapping("/saveTemplateContext")
+ public Result<?> saveTemplateContext(@RequestBody SaveTemplateContextDto saveTemplateContextDto) {
+ insOrderPlanService.saveTemplateContext(saveTemplateContextDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽崟閫夋嫨鐨勮澶�")
+ @GetMapping("/orderDevices")
+ public Result<?> getOrderDevices(Integer orderId) {
+ return Result.success(insOrderPlanService.getOrderDeviceIds(orderId));
+ }
+
+ @ApiOperation(value = "淇濆瓨妫�楠屽崟閫夋嫨鐨勮澶�")
+ @PutMapping("/orderDevices")
+ public Result<?> saveOrderDevices(@RequestBody SaveOrderDevicesDto saveOrderDevicesDto) {
+ insOrderPlanService.saveOrderDevices(saveOrderDevicesDto);
return Result.success();
}
@@ -154,8 +177,8 @@
@ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
@PostMapping("/write")
- public Result<?> write(@RequestBody InsOrder insOrder) {
- return Result.success(insProductService.write(insOrder));
+ public Result<?> write(@RequestBody WriteInspectionConditionDto dto) {
+ return Result.success(insProductService.write(dto));
}
@@ -244,7 +267,8 @@
@GetMapping("/getBindingProductByProductId")
public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getBindingProductId, productId)));
+ .eq(InsProduct::getBindingProductId, productId)
+ .orderByAsc(InsProduct::getSort)));
}
--
Gitblit v1.9.3