From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 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 e659d28..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
@@ -52,23 +52,24 @@
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
-
+ //鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
@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));
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋楠屽崟")
+ @PostMapping("/selectAllInsOrderParameter")
+ public Result selectAllInsOrderParameter() {
+ return Result.success();
}
+
@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 = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -85,7 +86,8 @@
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
- @ValueClassify("妫�楠屼笅鍗�")
+
+ @ValueAuth
@ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
@@ -95,6 +97,18 @@
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "妫�娴嬩腑蹇冧富浠诲鏍�/鐮斿彂閮ㄧ粡鐞嗗鏍�/鎶�鏈礋璐ｄ汉瀹℃牳")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
+ })
+ @PostMapping("/upInsOrderOfState2")
+ public Result<?> upInsOrderOfState2(@RequestBody InsOrder insOrder) {
+ return Result.success(insOrderService.upInsOrderOfState2(insOrder));
+ }
+
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
@PostMapping("/addInsOrderTemplate")
@@ -195,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")
@@ -202,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