From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +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/QualityTestStandardBindingController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
index b9c764e..c34f3ee 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -1,12 +1,9 @@
package com.ruoyi.quality.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
-import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
-import com.ruoyi.quality.service.QualityTestStandardParamService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,41 +19,44 @@
*/
@RestController
@RequestMapping("/qualityTestStandardBinding")
+@AllArgsConstructor
public class QualityTestStandardBindingController {
- @Autowired
private QualityTestStandardBindingService qualityTestStandardBindingService;
/**
* 鏂板妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�
+ *
* @param qualityTestStandardBindings
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
- return AjaxResult.success(qualityTestStandardBindingService.saveBatch(qualityTestStandardBindings));
+ public R<?> add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
+ return R.ok(qualityTestStandardBindingService.add(qualityTestStandardBindings));
}
/**
* 鍒犻櫎妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�
+ *
* @param ids
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids));
+ return R.ok(qualityTestStandardBindingService.removeBatchByIds(ids));
}
/**
- *妫�娴嬫寚鏍囩淮鎶ゆ煡璇�
+ * 妫�娴嬫寚鏍囩淮鎶ゆ煡璇�
+ *
* @return
*/
@GetMapping("/list")
- public AjaxResult listBinding(Long testStandardId) {
- return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId));
+ public R<?> listBinding(Long testStandardId) {
+ return R.ok(qualityTestStandardBindingService.listBinding(testStandardId));
}
}
--
Gitblit v1.9.3