From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 04095f5..2e715ac 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -1,25 +1,25 @@
package com.ruoyi.quality.controller;
-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.pojo.QualityTestStandard;
import com.ruoyi.quality.service.IQualityTestStandardService;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffOnJobService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
- * 妫�娴嬫寚鏍囩淮鎶�
+ * <p>
+ * 妫�娴嬫爣鍑嗕富琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:40:24
*/
@RestController
-@RequestMapping("/quality/qualityTestStandard")
+@RequestMapping("/qualityTestStandard")
public class QualityTestStandardController {
@Resource
@@ -27,7 +27,7 @@
/**
- * 鏂板妫�娴嬫寚鏍囩淮鎶�
+ * 鏂板妫�娴嬫爣鍑嗕富琛�
* @param qualityTestStandard
* @return
*/
@@ -37,7 +37,7 @@
}
/**
- * 鍒犻櫎妫�娴嬫寚鏍囩淮鎶�
+ * 鍒犻櫎妫�娴嬫爣鍑嗕富琛�
* @param ids
* @return
*/
@@ -50,17 +50,7 @@
}
/**
- * 妫�娴嬫寚鏍囩淮鎶よ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
- }
-
- /**
- * 妫�娴嬫寚鏍囩淮鎶や慨鏀�
+ * 妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�
* @param qualityTestStandard
* @return
*/
@@ -70,7 +60,7 @@
}
/**
- *妫�娴嬫寚鏍囩淮鎶ゅ垎椤垫煡璇�
+ *妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�
* @param page
* @param qualityTestStandard
* @return
@@ -81,24 +71,23 @@
}
/**
- * 妫�娴嬫寚鏍囩淮鎶ゅ鍑�
- * @param response
+ * 妫�娴嬫爣鍑嗗鍒跺弬鏁�
* @param qualityTestStandard
+ * @return
*/
- @PostMapping("/export")
- public void qualityTestStandardListPageExport(HttpServletResponse response,QualityTestStandard qualityTestStandard) {
- qualityTestStandardService.qualityTestStandardListPageExport(response, qualityTestStandard);
+ @PostMapping("/copyParam")
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
/**
- * 璇︽儏
- * @param productId
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
* @return
*/
- @GetMapping("/product/{productId}")
- public AjaxResult QualityInspectDetail(@PathVariable("productId") Long productId) {
- return AjaxResult.success(qualityTestStandardService.list(Wrappers.<QualityTestStandard>lambdaQuery().eq(QualityTestStandard::getProductId,productId)));
+ @PostMapping("/qualityTestStandardAudit")
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
-
}
--
Gitblit v1.9.3