From 97bb7a8832281eafe0ef947ea095258d355e52f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 十二月 2024 15:57:51 +0800
Subject: [PATCH] 无源器件的数采+电路模版查询
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 7eecc14..626923c 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
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
+
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
@@ -59,19 +60,10 @@
return Result.success();
}
-
- @ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "妫�楠屽垎閰�")
- @PostMapping("/upInsOrder")
- //鏆傛椂鍋滅敤
- public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
- return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
- }
-
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
- public Result<?> addInsOrder(@RequestParam String str, @RequestParam List<MultipartFile> files) {
+ public Result<?> addInsOrder(@RequestParam String str, List<MultipartFile> files) {
Map<String, Object> map = JSON.parseObject(str, Map.class);
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
@@ -227,8 +219,8 @@
@ValueAuth
@ApiOperation(value = "濉啓鐢垫満缂栧彿")
@PostMapping("/addNumber")
- public Result<?> addNumber(@RequestBody List<InsSample> insSamples) {
- return Result.success(insOrderService.addNumber(insSamples));
+ public Result<?> addNumber(@RequestBody AddNumberDto addNumberDto) {
+ return Result.success(insOrderService.addNumber(addNumberDto.getInsSamples()));
}
@ValueClassify("璐圭敤缁熻")
@@ -238,4 +230,6 @@
CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
insOrderService.export(costStatisticsDto,response);
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3