From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
index 55508ec..16788c9 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -2,10 +2,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.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +27,10 @@
*/
@RestController
@RequestMapping("/qualityTestStandardParam")
+@AllArgsConstructor
+@Tag(name = "妫�娴嬫爣鍑嗗弬鏁�")
public class QualityTestStandardParamController {
- @Autowired
private QualityTestStandardParamService qualityTestStandardParamService;
/**
@@ -33,8 +39,10 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam));
+ @Operation(summary = "鏂板妫�娴嬫爣鍑嗗弬鏁�")
+ @Log(title = "鏂板妫�娴嬫爣鍑嗗弬鏁�", businessType = BusinessType.INSERT)
+ public R<?> add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return R.ok(qualityTestStandardParamService.save(qualityTestStandardParam));
}
/**
@@ -43,11 +51,13 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
+ @Operation(summary = "鍒犻櫎妫�娴嬫寚鏍囩淮鎶�")
+ @Log(title = "鍒犻櫎妫�娴嬫寚鏍囩淮鎶�", businessType = BusinessType.DELETE)
+ public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardParamService.removeBatchByIds(ids));
+ return R.ok(qualityTestStandardParamService.removeBatchByIds(ids));
}
/**
@@ -56,8 +66,10 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam));
+ @Operation(summary = "妫�娴嬫寚鏍囩淮鎶や慨鏀�")
+ @Log(title = "妫�娴嬫寚鏍囩淮鎶や慨鏀�", businessType = BusinessType.UPDATE)
+ public R<?> update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return R.ok(qualityTestStandardParamService.updateById(qualityTestStandardParam));
}
/**
@@ -65,8 +77,10 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult list(Long testStandardId) {
- return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
+ @Operation(summary = "妫�娴嬫寚鏍囩淮鎶ゆ煡璇�")
+ @Log(title = "妫�娴嬫寚鏍囩淮鎶ゆ煡璇�", businessType = BusinessType.OTHER)
+ public R<?> list(Long testStandardId) {
+ return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
}
}
--
Gitblit v1.9.3