From f682213b9ff8a7d41ea16edfb1b68d996c46e080 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 29 三月 2025 14:03:36 +0800
Subject: [PATCH] 1.清除无用方法 2.检测项目预警修改 3.数采绑定调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 2f95736..880fad5 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
@@ -27,6 +27,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
@@ -76,6 +77,7 @@
}
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
@@ -216,7 +218,7 @@
public Result<?> delInsOrder(Integer insOrderId) {
// 鏌ヨ璁㈠崟
InsOrder order = insOrderService.getById(insOrderId);
- if (!order.getState().equals(2)) {
+ if (!(order.getState().equals(2) || order.getState().equals(3))) {
throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
}
@@ -233,8 +235,7 @@
@ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
@GetMapping("/getSampleByOrderId")
public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
- return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, insOrderId)));
+ return Result.success(insSampleService.getSampleByOrderId(insOrderId));
}
@ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
@@ -251,9 +252,19 @@
}
@ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllInsOrderExport")
- public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+ @GetMapping("/rawAllInsOrderExport")
+ public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response){
insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
}
+
+ @ApiOperation(value = "淇敼鏍峰搧鍨嬪彿")
+ @PostMapping("/updateSampleModel")
+ public Result<?> updateSampleModel(@RequestBody List<InsSample> insSampleList) {
+ for (InsSample insSample : insSampleList) {
+ insOrderService.updateSampleModel(insSample);
+ }
+ return Result.success();
+ }
+
}
--
Gitblit v1.9.3