From a24095d096e7ab1f83e44aa8054d0f673db05b38 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 09:09:40 +0800
Subject: [PATCH] Merge branch 'dev_dz' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..21a7226 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("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
}
@@ -251,8 +253,8 @@
}
@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);
}
--
Gitblit v1.9.3