From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 074496d..61a8a7b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -73,14 +73,12 @@
     @ApiOperation(value = "涓嬪崟鎸夐挳")
     @PostMapping("/addInsOrder")
     @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
-    public Result<?> addInsOrder(String str) {
-        Map<String, Object> map = JSON.parseObject(str, Map.class);
-        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);
-        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
-        List<List<Integer>> fiberPairing = JSON.parseArray(map.get("fiberPairing")+"");//鍏夌氦閰嶇疆閲岀殑鐔旀帴閰嶅
-        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,fiberPairing));
+    public Result<?> addInsOrder(@RequestBody AddInsOrderDTO addInsOrderDTO) {
+        return Result.success(insOrderService.addInsOrder(
+                addInsOrderDTO.getList(),
+                addInsOrderDTO.getInsOrder(),
+                addInsOrderDTO.getPairing(),
+                addInsOrderDTO.getFiberPairing()));
     }
 
     @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -92,7 +90,6 @@
 
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
     @GetMapping("/getInsOrder")
-    @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.OTHER)
     public Result<?> getInsOrder(Integer orderId) {
         return Result.success(insOrderService.getInsOrder(orderId));
     }

--
Gitblit v1.9.3