From a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 14:36:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java | 2 ++
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java | 2 +-
src/main/resources/static/safe-training.docx | 0
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java | 16 ++++++++++++++++
4 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
index b9c764e..801eaaf 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -34,7 +34,7 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
- return AjaxResult.success(qualityTestStandardBindingService.saveBatch(qualityTestStandardBindings));
+ return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java b/src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java
index a5e6568..9ad4b62 100644
--- a/src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java
+++ b/src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java
@@ -18,4 +18,6 @@
public interface QualityTestStandardBindingService extends IService<QualityTestStandardBinding> {
List<QualityTestStandardBindingDto> listBinding(Long testStandardId);
+
+ int add(List<QualityTestStandardBinding> qualityTestStandardBindings);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
index 1b372ec..86c6e7f 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.quality.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.quality.dto.QualityTestStandardBindingDto;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
@@ -28,4 +29,19 @@
public List<QualityTestStandardBindingDto> listBinding(Long testStandardId) {
return qualityTestStandardBindingMapper.listBinding(testStandardId);
}
+
+ @Override
+ public int add(List<QualityTestStandardBinding> qualityTestStandardBindings) {
+ //鍒ゆ柇鏄惁宸茬粡鏈夌粦瀹氳繃鐨勬暟鎹�
+ for (QualityTestStandardBinding qualityTestStandardBinding : qualityTestStandardBindings) {
+ List<QualityTestStandardBinding> testStandardBindings = qualityTestStandardBindingMapper.selectList(Wrappers.<QualityTestStandardBinding>lambdaQuery()
+ .eq(QualityTestStandardBinding::getTestStandardId, qualityTestStandardBinding.getTestStandardId())
+ .eq(QualityTestStandardBinding::getProductId, qualityTestStandardBinding.getProductId()));
+ if (testStandardBindings.size() > 0){
+ throw new RuntimeException("璇ヤ骇鍝佸凡缁忕粦瀹氳繃,璇锋鏌�");
+ }
+ }
+ saveBatch(qualityTestStandardBindings);
+ return 0;
+ }
}
diff --git a/src/main/resources/static/safe-training.docx b/src/main/resources/static/safe-training.docx
index 0bc1d64..74e9150 100644
--- a/src/main/resources/static/safe-training.docx
+++ b/src/main/resources/static/safe-training.docx
Binary files differ
--
Gitblit v1.9.3