From 63328dd80adc6331db581dda6418308e6fd4da12 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:50:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 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 5c246bc..3081a65 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,30 +1,41 @@
package com.ruoyi.quality.service.impl;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityTestStandardMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityTestStandard;
-import com.ruoyi.quality.service.IQualityInspectService;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import lombok.AllArgsConstructor;
-import org.springframework.security.core.parameters.P;
+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 javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.stream.Collectors;
-@AllArgsConstructor
+
+/**
+ * <p>
+ * 妫�娴嬫爣鍑嗕富琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:40:24
+ */
@Service
-public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService {
+public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService {
+ @Autowired
private QualityTestStandardMapper qualityTestStandardMapper;
+ @Autowired
+ private QualityTestStandardParamMapper qualityTestStandardParamMapper;
+
+ @Autowired
+ private QualityTestStandardParamService qualityTestStandardParamService;
@Override
public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
@@ -32,9 +43,20 @@
}
@Override
- public void qualityTestStandardListPageExport(HttpServletResponse response, QualityTestStandard qualityTestStandard) {
- List<QualityTestStandard> qualityTestStandards =qualityTestStandardMapper.qualityTestStandardList(qualityTestStandard);
- ExcelUtil<QualityTestStandard> util = new ExcelUtil<QualityTestStandard>(QualityTestStandard.class);
- util.exportExcel(response, qualityTestStandards, "妫�娴嬫寚鏍囧鍑�");
+ public int copyParam(QualityTestStandard qualityTestStandard) {
+ //鍏堟煡璇㈣澶嶅埗鐨勬娴嬫爣鍑嗙殑璇︽儏鍙傛暟
+ 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(testStandard.getId());
+ return oldQualityTestStandardParam;
+ }).collect(Collectors.toList());
+ qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
+ return 0;
}
+
+
}
--
Gitblit v1.9.3