From aad28a866d7d200e1228f7a5d053348e7f9653a4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 13:47:38 +0800
Subject: [PATCH] 统计+首页+电路试验提交bug
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 4695229..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
@@ -5,13 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.CostStatisticsDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
-import com.yuanchu.mom.dto.SampleProductDto;
-import com.yuanchu.mom.dto.SampleProductDto2;
+import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
@@ -23,12 +21,14 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
+
@RestController
@AllArgsConstructor
@@ -60,23 +60,16 @@
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(String str) {
+ 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);
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));
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,files));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -216,6 +209,20 @@
return Result.success(insOrderService.labelPrinting(ids));
}
+ @ValueAuth
+ @ApiOperation(value = "鏍￠獙鐢垫満缂栧彿")
+ @PostMapping("/checkNumber")
+ public Result<?> checkNumber(String ids) {
+ return Result.success(insOrderService.checkNumber(ids));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "濉啓鐢垫満缂栧彿")
+ @PostMapping("/addNumber")
+ public Result<?> addNumber(@RequestBody AddNumberDto addNumberDto) {
+ return Result.success(insOrderService.addNumber(addNumberDto.getInsSamples()));
+ }
+
@ValueClassify("璐圭敤缁熻")
@ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
@PostMapping("/export")
@@ -223,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