From c92bf69063c83be167d796fd4576e3b95dd7880e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 04:22:25 +0800
Subject: [PATCH] 实现电缆配置
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 5d20623..5e98366 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -42,13 +42,21 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
+ @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
+ @PostMapping("/selectAllInsOrder")
+ public Result selectAllInsOrder(){
+ return Result.success();
+ }
+
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "妫�楠屽垎閰�")
@PostMapping("/upInsOrder")
@@ -62,7 +70,8 @@
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- return Result.success(insOrderService.addInsOrder(list, insOrder));
+ List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -140,15 +149,15 @@
}
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "鏇存柊鐘舵��")
+ @ApiOperation(value = "鎾ら攢")
@PutMapping("/updateStatus")
public Result<?> updateStatus(Integer id) {
insOrderService.updateStatus(id);
return Result.success();
}
- @ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation("灏嗗緟妫�楠岀殑鐨勬挙閿�鏇存敼")
+
@PutMapping("/updateInspected")
+ @ValueAuth
public Result<?> updateInspected(Integer id){
insProductService.updateInspected(id);
return Result.success();
--
Gitblit v1.9.3