From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 2e715ac..5f14221 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -1,12 +1,16 @@
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.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;
@@ -25,6 +29,9 @@
@Resource
private IQualityTestStandardService qualityTestStandardService;
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
+
/**
* 鏂板妫�娴嬫爣鍑嗕富琛�
@@ -33,7 +40,7 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
+ return AjaxResult.success(qualityTestStandardService.saveWithProcessTypeValidate(qualityTestStandard));
}
/**
@@ -46,7 +53,7 @@
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -56,7 +63,7 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
+ return AjaxResult.success(qualityTestStandardService.updateWithProcessTypeValidate(qualityTestStandard));
}
/**
@@ -90,4 +97,22 @@
return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ }
+
}
--
Gitblit v1.9.3