From f8ccc5ab312ab7c5d6c7eb7fac4e37924f513869 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 03 十一月 2026 19:25:29 +0800
Subject: [PATCH] fix: 完善质量检验接口与质检员分配
---
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
index 3d6df0c..78fb8ee 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
@@ -9,6 +9,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
+import com.ruoyi.quality.util.QualityInspectionValueValidator;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,9 @@
@Resource
private IQualityInspectParamService qualityInspectParamService;
+
+ @Resource
+ private IQualityInspectService qualityInspectService;
/**
* 璇︽儏
@@ -44,6 +49,31 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
+ if (CollectionUtils.isEmpty(qualityInspectParams)) {
+ return AjaxResult.error("妫�楠岄」鐩笉鑳戒负绌�");
+ }
+ Long inspectId = qualityInspectParams.get(0).getInspectId();
+ if (inspectId == null) {
+ return AjaxResult.error("妫�楠岃褰旾D涓嶈兘涓虹┖");
+ }
+ QualityInspect inspect = qualityInspectService.getById(inspectId);
+ if (inspect == null) {
+ return AjaxResult.error("妫�楠岃褰曚笉瀛樺湪");
+ }
+ if (Integer.valueOf(1).equals(inspect.getInspectState())) {
+ return AjaxResult.error("宸叉彁浜ょ殑妫�楠岃褰曚笉鑳戒慨鏀�");
+ }
+ for (QualityInspectParam parameter : qualityInspectParams) {
+ if (StringUtils.isBlank(parameter.getTestValue())) {
+ return AjaxResult.error("璇峰～鍐欌��" + parameter.getParameterItem() + "鈥濈殑妫�楠屽��");
+ }
+ }
+ if ("鍚堟牸".equals(inspect.getCheckResult())) {
+ String valueMessage = QualityInspectionValueValidator.validateQualified(qualityInspectParams);
+ if (valueMessage != null) {
+ return AjaxResult.error(valueMessage);
+ }
+ }
return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
}
--
Gitblit v1.9.3