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 | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 770dea5..ab8fca9 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,15 +2,20 @@
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.dto.QualityTestStandardDto;
+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.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Resource;
import java.util.List;
/**
@@ -23,10 +28,14 @@
*/
@RestController
@RequestMapping("/qualityTestStandard")
+@Tag(name = "妫�娴嬫爣鍑嗕富琛�")
public class QualityTestStandardController {
@Resource
private IQualityTestStandardService qualityTestStandardService;
+
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
/**
@@ -35,8 +44,10 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
+ @Operation(summary = "鏂板妫�娴嬫爣鍑嗕富琛�")
+ @Log(title = "鏂板妫�娴嬫爣鍑嗕富琛�", businessType = BusinessType.INSERT)
+ public R<?> add(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.save(qualityTestStandard));
}
/**
@@ -45,21 +56,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(qualityTestStandardService.removeBatchByIds(ids));
- }
-
- /**
- * 妫�娴嬫爣鍑嗕富琛ㄨ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
+ return R.ok(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -68,8 +71,10 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
+ @Operation(summary = "妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�", businessType = BusinessType.UPDATE)
+ public R<?> update(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.updateById(qualityTestStandard));
}
/**
@@ -79,18 +84,56 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
+ @Operation(summary = "妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�")
+ @Log(title = "妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�", businessType = BusinessType.OTHER)
+ public R<?> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
}
/**
* 妫�娴嬫爣鍑嗗鍒跺弬鏁�
- * @param qualityTestStandardDto
+ * @param qualityTestStandard
* @return
*/
@PostMapping("/copyParam")
- public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
- return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
+ @Operation(summary = "妫�娴嬫爣鍑嗗鍒跺弬鏁�")
+ @Log(title = "妫�娴嬫爣鍑嗗鍒跺弬鏁�", businessType = BusinessType.OTHER)
+ public R<?> copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.copyParam(qualityTestStandard));
+ }
+
+ /**
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
+ * @return
+ */
+ @PostMapping("/qualityTestStandardAudit")
+ @Operation(summary = "妫�娴嬫爣鍑嗘壒閲忓鏍�")
+ @Log(title = "妫�娴嬫爣鍑嗘壒閲忓鏍�", businessType = BusinessType.OTHER)
+ public R<?> qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return R.ok(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ }
+
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @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));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @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