From 7756d174ac93226a909aaf9d5beaf5fe9a923e34 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 15:37:03 +0800
Subject: [PATCH] 保存检验任务传参封装
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 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 e65b4ea..bda6f2e 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
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -75,16 +75,10 @@
return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
}
- //todo: 涓嬪崟闇�瑕佷慨鏀�
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
- 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")+"");
- return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
+ public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -217,11 +211,6 @@
return Result.success();
}
- @Scheduled(fixedDelay = 1200000)
- public void getIfsOrderTiming() {
- insOrderService.getIfsOrder();
- }
-
@ApiOperation(value = "淇敼璁㈠崟鍗曞彿")
@PostMapping("/updateEntrustCode")
@@ -235,19 +224,6 @@
public Result<?> getRetestResult(Integer insProductId) {
return Result.success(insOrderService.getRetestResult(insProductId));
}
-
-
-
- @ApiOperation(value = "閾滃崟涓濅笅鍗�")
- @PostMapping("/addRawCopperOrder")
- public Result<?> addRawCopperOrder(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);
- CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
- return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
- }
-
@ApiOperation(value = "淇敼濮旀墭缂栧彿")
@PostMapping("/updateOrderEntrustCode")
@@ -263,7 +239,7 @@
}
@ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
- @GetMapping("/delInsOrder")
+ @DeleteMapping("/delInsOrder")
public Result<?> delInsOrder(Integer insOrderId) {
// 鏌ヨ璁㈠崟
InsOrder order = insOrderService.getById(insOrderId);
--
Gitblit v1.9.3