From 3baa0061112a555d75c6bc606d5271ec842ac607 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:55:40 +0800
Subject: [PATCH] 去除公司名称

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
index 2456861..1f41334 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
@@ -1,9 +1,13 @@
 package com.ruoyi.inspect.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.inspect.dto.InsProductDeviationWarningDto;
 import com.ruoyi.inspect.dto.SampleOrderDto;
+import com.ruoyi.inspect.pojo.InsProductDeviationWarningDetail;
+import com.ruoyi.inspect.service.InsProductDeviationWarningDetailService;
 import com.ruoyi.inspect.service.InsProductDeviationWarningService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,12 +16,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 妫�楠岄」鍋忓樊棰勮涓昏〃 鍓嶇鎺у埗鍣�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
  * @since 2025-03-28 02:18:02
  */
 @RestController
@@ -28,6 +34,7 @@
 
 
     private InsProductDeviationWarningService insProductDeviationWarningService;
+    private InsProductDeviationWarningDetailService insProductDeviationWarningDetailService;
 
     /**
      * 鏌ヨ棰勮鍒楄〃
@@ -37,20 +44,20 @@
      */
     @ApiOperation(value = "鏌ヨ棰勮鍒楄〃")
     @GetMapping("/selectDeviationWarningPage")
-    public Result selectDeviationWarningPage(Page page, InsProductDeviationWarningDto deviationWarningDto) {
+    public Result<IPage<InsProductDeviationWarningDto>> selectDeviationWarningPage(Page page, InsProductDeviationWarningDto deviationWarningDto) {
         return Result.success(insProductDeviationWarningService.selectDeviationWarningPage(page, deviationWarningDto));
     }
 
-//    /**
-//     * 鏌ヨ棰勮璇︽儏
-//     * @param page
-//     * @return
-//     * @throws Exception
-//     */
-//    @ApiOperation(value = "鏌ヨ棰勮鍒楄〃")
-//    @GetMapping("/selectDeviationWarning")
-//    public Result selectDeviationWarning(InsProductDeviationWarningDto deviationWarningDto){
-////        return Result.success(insProductDeviationWarningService.selectDeviationWarningPage(page, deviationWarningDto));
-//    }
+    /**
+     * 鏌ヨ棰勮璇︽儏
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation(value = "鏌ヨ棰勮璇︽儏")
+    @GetMapping("/selectDeviationWarning")
+    public Result<List<InsProductDeviationWarningDetail>> selectDeviationWarning(Integer deviationWarningId){
+        return Result.success(insProductDeviationWarningDetailService.list(Wrappers.<InsProductDeviationWarningDetail>lambdaQuery()
+                .eq(InsProductDeviationWarningDetail::getDeviationWarningId, deviationWarningId)));
+    }
 
 }

--
Gitblit v1.9.3