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/InsProductDeviationWarningController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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..42ffb37 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;
@@ -11,6 +15,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -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