From 5dc34f36049194d1a124eb60dd68cb17e498caec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 四月 2026 09:49:13 +0800
Subject: [PATCH] fix：原料、过程与出厂检验导出列修改
---
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
index 371ab5d..21b9e0e 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,25 +1,26 @@
package com.ruoyi.quality.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.mapper.ProductModelMapper;
-import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
-import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -87,5 +88,42 @@
return qualityTestStandardMapper.deleteBatchIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveWithProcessTypeValidate(QualityTestStandard qualityTestStandard) {
+ validateProcessType(qualityTestStandard);
+ return this.save(qualityTestStandard);
+ }
+
+ @Override
+ public boolean updateWithProcessTypeValidate(QualityTestStandard qualityTestStandard) {
+ validateProcessType(qualityTestStandard);
+ return this.updateById(qualityTestStandard);
+ }
+
+ private void validateProcessType(QualityTestStandard qualityTestStandard) {
+ if (qualityTestStandard == null || qualityTestStandard.getProcessType() == null) {
+ return;
+ }
+
+ String dictType = "product_process_type";
+ String input = String.valueOf(qualityTestStandard.getProcessType());
+
+ String dictValue = DictUtils.getDictValue(dictType, input);
+ if (StringUtils.isNotEmpty(dictValue)) {
+ qualityTestStandard.setProcessType(Integer.valueOf(dictValue));
+ return;
+ }
+
+ String dictValues = DictUtils.getDictValues(dictType);
+ if (StringUtils.isNotEmpty(dictValues)) {
+ List<String> valueList = Arrays.asList(dictValues.split(DictUtils.SEPARATOR));
+ if (valueList.contains(input)) {
+ return;
+ }
+ }
+
+ throw new ServiceException("宸ュ簭绫诲瀷銆�" + input + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細" + DictUtils.getDictLabels(dictType));
+ }
}
--
Gitblit v1.9.3