From 3f2d4ba07ee9e1e0ddba97b43dc70af09f0e39a2 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:40:30 +0800
Subject: [PATCH] 审核附件修改
---
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 e8aab9e..ed777a7 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -3,15 +3,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.quality.dto.QualityTestStandardDto;
-import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
-import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityTestStandard;
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -27,33 +28,50 @@
* @since 2026-01-13 03:40:24
*/
@Service
+@RequiredArgsConstructor
public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService {
- @Autowired
- private QualityTestStandardMapper qualityTestStandardMapper;
-
- @Autowired
- private QualityTestStandardParamMapper qualityTestStandardParamMapper;
-
- @Autowired
- private QualityTestStandardParamService qualityTestStandardParamService;
+ private final QualityTestStandardMapper qualityTestStandardMapper;
+ private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private final QualityTestStandardParamService qualityTestStandardParamService;
+ private final QualityInspectMapper qualityInspectMapper;
@Override
public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
- return qualityTestStandardMapper.qualityTestStandardListPage(page,qualityTestStandard);
+ return qualityTestStandardMapper.qualityTestStandardListPage(page, qualityTestStandard);
}
@Override
- public int copyParam(QualityTestStandardDto qualityTestStandardDto) {
+ public int copyParam(QualityTestStandard qualityTestStandard) {
//鍏堟煡璇㈣澶嶅埗鐨勬娴嬫爣鍑嗙殑璇︽儏鍙傛暟
- List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandardDto.getOldTestStandardId()));
+ List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.getId()));
+ QualityTestStandard testStandard = qualityTestStandardMapper.selectById(qualityTestStandard.getId());
+ testStandard.setId(null);
+ testStandard.setStandardNo(null);
+ qualityTestStandardMapper.insert(testStandard);
List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> {
- oldQualityTestStandardParam.setTestStandardId(qualityTestStandardDto.getNewTestStandardId());
+ oldQualityTestStandardParam.setTestStandardId(testStandard.getId());
+ oldQualityTestStandardParam.setId(null);
return oldQualityTestStandardParam;
}).collect(Collectors.toList());
qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
return 0;
}
+ @Override
+ public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process) {
+ return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType, process);
+ }
+
+ @Override
+ public int delQualityTestStandard(List<Integer> ids) {
+ //鍏堟煡璇㈣妫�娴嬫爣鍑嗘槸鍚︽湁琚紩鐢ㄥ鏋滆寮曠敤灏变笉鍏佽鍒犻櫎
+ List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().in(QualityInspect::getTestStandardId, ids));
+ if (qualityInspects.size() > 0) {
+ throw new RuntimeException("璇ユ娴嬫爣鍑嗘湁琚紩鐢ㄤ笉鍏佽鍒犻櫎");
+ }
+ return qualityTestStandardMapper.deleteBatchIds(ids);
+ }
+
}
--
Gitblit v1.9.3