From 3a344a98e3e2ee732aab2158670cbe837a4b1458 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 11:15:34 +0800
Subject: [PATCH] fix:不合格管理查询
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index ac40c91..7b8a5ae 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -1,12 +1,20 @@
package com.ruoyi.quality.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;
@@ -18,12 +26,16 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-13 03:40:24
*/
+@Api(tags = "妫�娴嬫爣鍑嗕富琛�")
@RestController
@RequestMapping("/qualityTestStandard")
public class QualityTestStandardController {
@Resource
private IQualityTestStandardService qualityTestStandardService;
+
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
/**
@@ -32,6 +44,8 @@
* @return
*/
@PostMapping("/add")
+ @ApiOperation("鏂板妫�娴嬫爣鍑嗕富琛�")
+ @Log(title = "鏂板妫�娴嬫爣鍑嗕富琛�", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
}
@@ -42,11 +56,13 @@
* @return
*/
@DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎妫�娴嬫爣鍑嗕富琛�")
+ @Log(title = "鍒犻櫎妫�娴嬫爣鍑嗕富琛�", businessType = BusinessType.DELETE)
public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -55,6 +71,8 @@
* @return
*/
@PostMapping("/update")
+ @ApiOperation("妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
}
@@ -66,6 +84,8 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�", businessType = BusinessType.OTHER)
public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
}
@@ -76,8 +96,44 @@
* @return
*/
@PostMapping("/copyParam")
+ @ApiOperation("妫�娴嬫爣鍑嗗鍒跺弬鏁�")
+ @Log(title = "妫�娴嬫爣鍑嗗鍒跺弬鏁�", businessType = BusinessType.OTHER)
public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
+ /**
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
+ * @return
+ */
+ @PostMapping("/qualityTestStandardAudit")
+ @ApiOperation("妫�娴嬫爣鍑嗘壒閲忓鏍�")
+ @Log(title = "妫�娴嬫爣鍑嗘壒閲忓鏍�", businessType = BusinessType.OTHER)
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ }
+
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ @ApiOperation("鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�")
+ @Log(title = "鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�", businessType = BusinessType.OTHER)
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ @ApiOperation("鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�")
+ @Log(title = "鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�", businessType = BusinessType.OTHER)
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ }
+
}
--
Gitblit v1.9.3