From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 0ccfd65..ab8fca9 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,6 +2,8 @@
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.R;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
@@ -43,6 +45,7 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板妫�娴嬫爣鍑嗕富琛�")
+ @Log(title = "鏂板妫�娴嬫爣鍑嗕富琛�", businessType = BusinessType.INSERT)
public R<?> add(@RequestBody QualityTestStandard qualityTestStandard) {
return R.ok(qualityTestStandardService.save(qualityTestStandard));
}
@@ -54,6 +57,7 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎妫�娴嬫爣鍑嗕富琛�")
+ @Log(title = "鍒犻櫎妫�娴嬫爣鍑嗕富琛�", businessType = BusinessType.DELETE)
public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -68,6 +72,7 @@
*/
@PostMapping("/update")
@Operation(summary = "妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�", businessType = BusinessType.UPDATE)
public R<?> update(@RequestBody QualityTestStandard qualityTestStandard) {
return R.ok(qualityTestStandardService.updateById(qualityTestStandard));
}
@@ -80,6 +85,7 @@
*/
@GetMapping("/listPage")
@Operation(summary = "妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�", businessType = BusinessType.OTHER)
public R<?> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
return R.ok(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
}
@@ -91,6 +97,7 @@
*/
@PostMapping("/copyParam")
@Operation(summary = "妫�娴嬫爣鍑嗗鍒跺弬鏁�")
+ @Log(title = "妫�娴嬫爣鍑嗗鍒跺弬鏁�", businessType = BusinessType.OTHER)
public R<?> copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
return R.ok(qualityTestStandardService.copyParam(qualityTestStandard));
}
@@ -102,6 +109,7 @@
*/
@PostMapping("/qualityTestStandardAudit")
@Operation(summary = "妫�娴嬫爣鍑嗘壒閲忓鏍�")
+ @Log(title = "妫�娴嬫爣鍑嗘壒閲忓鏍�", businessType = BusinessType.OTHER)
public R<?> qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
return R.ok(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
@@ -112,6 +120,7 @@
*/
@GetMapping("/getQualityTestStandardByProductId")
@Operation(summary = "鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�")
+ @Log(title = "鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�", businessType = BusinessType.OTHER)
public R<?> getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
return R.ok(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
}
@@ -122,6 +131,7 @@
*/
@GetMapping("/getQualityTestStandardParamByTestStandardId")
@Operation(summary = "鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�")
+ @Log(title = "鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�", businessType = BusinessType.OTHER)
public R<?> getQualityTestStandardParamByTestStandardId(Long testStandardId) {
return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
}
--
Gitblit v1.9.3