From 526f6c1fed7033682c3fc9e2c7561e1c015278a2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 13 一月 2026 16:42:38 +0800
Subject: [PATCH] 质检的指标维护复制功能重新编写
---
/dev/null | 11 -----------
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java | 2 +-
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 3 +--
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 19 +++----------------
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 11 +++++++----
src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java | 5 +----
6 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 770dea5..ac40c91 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -1,16 +1,13 @@
package com.ruoyi.quality.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.service.IQualityTestStandardService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -53,16 +50,6 @@
}
/**
- * 妫�娴嬫爣鍑嗕富琛ㄨ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
- }
-
- /**
* 妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�
* @param qualityTestStandard
* @return
@@ -85,12 +72,12 @@
/**
* 妫�娴嬫爣鍑嗗鍒跺弬鏁�
- * @param qualityTestStandardDto
+ * @param qualityTestStandard
* @return
*/
@PostMapping("/copyParam")
- public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
- return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityTestStandardDto.java b/src/main/java/com/ruoyi/quality/dto/QualityTestStandardDto.java
deleted file mode 100644
index c0a1d87..0000000
--- a/src/main/java/com/ruoyi/quality/dto/QualityTestStandardDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.ruoyi.quality.dto;
-
-import lombok.Data;
-
-//澶嶅埗妫�娴嬫爣鍑嗙殑浼犲弬
-@Data
-public class QualityTestStandardDto {
-
- private Long oldTestStandardId;
- private Long newTestStandardId;
-}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index 437391c..d2fb853 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("鏍囧噯缂栧彿")
private String standardNo;
@@ -62,7 +62,6 @@
private Long tenantId;
@ApiModelProperty("鐘舵��")
- @TableLogic
private String state;
@ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
index f1e1d13..1abd96f 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("鍙傛暟椤�")
private String parameterItem;
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
index 64949cc..7d76fac 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
-
-import javax.servlet.http.HttpServletResponse;
/**
* <p>
@@ -20,6 +17,6 @@
IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard);
- int copyParam(QualityTestStandardDto qualityTestStandardDto);
+ int copyParam(QualityTestStandard qualityTestStandard);
}
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..3081a65 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -3,7 +3,6 @@
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.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -44,11 +43,15 @@
}
@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());
return oldQualityTestStandardParam;
}).collect(Collectors.toList());
qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
--
Gitblit v1.9.3