From 5c58ac36853e09b09498ac2ed75bf5a9e7b80e12 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:35:25 +0800
Subject: [PATCH] 浪潮对接单点登录:能耗管理系统2
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 770dea5..c018bce 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -3,14 +3,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -28,6 +29,8 @@
@Resource
private IQualityTestStandardService qualityTestStandardService;
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
/**
* 鏂板妫�娴嬫爣鍑嗕富琛�
@@ -53,16 +56,6 @@
}
/**
- * 妫�娴嬫爣鍑嗕富琛ㄨ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
- }
-
- /**
* 妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�
* @param qualityTestStandard
* @return
@@ -85,12 +78,40 @@
/**
* 妫�娴嬫爣鍑嗗鍒跺弬鏁�
- * @param qualityTestStandardDto
+ * @param qualityTestStandard
* @return
*/
@PostMapping("/copyParam")
- public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
- return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
+ }
+
+ /**
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
+ * @return
+ */
+ @PostMapping("/qualityTestStandardAudit")
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ }
+
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
}
}
--
Gitblit v1.9.3