From 0ab755d7791bf3fff9b9e3b47abbbc8e795999ce Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 八月 2025 17:08:53 +0800
Subject: [PATCH] 质检提交下载优化
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 14 +++++++-------
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 12 ++++++------
src/main/java/com/ruoyi/quality/service/IQualityInspectService.java | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 0daeba8..fa50217 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -109,21 +109,21 @@
/**
* 鎻愪氦
- * @param id
+ * @param qualityInspect
* @return
*/
@PostMapping("/submit")
- public AjaxResult submit(Integer id) {
- return AjaxResult.success(qualityInspectService.submit(id));
+ public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
+ return AjaxResult.success(qualityInspectService.submit(qualityInspect));
}
/**
* 涓嬭浇
* @param response
- * @param id
+ * @param qualityInspect
*/
@PostMapping("/down")
- public void down(HttpServletResponse response,Integer id) {
- qualityInspectService.down(response, id);
+ public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
+ qualityInspectService.down(response, qualityInspect);
}
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
index 1dcba08..f464e9b 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
@@ -24,7 +24,7 @@
QualityInspectDto getDetailById(Integer id);
- int submit(Integer id);
+ int submit(QualityInspect qualityInspect);
- void down(HttpServletResponse response, Integer id);
+ void down(HttpServletResponse response, QualityInspect qualityInspect);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 4bb8185..889f0a2 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -79,14 +79,14 @@
//鎻愪氦
@Override
- public int submit(Integer id) {
- QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ public int submit(QualityInspect inspect) {
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
/*鍒ゆ柇涓嶅悎鏍�*/
if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
QualityUnqualified qualityUnqualified = new QualityUnqualified();
BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
qualityUnqualified.setInspectState(0);//寰呭鐞�
- List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
+ List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualifiedMapper.insert(qualityUnqualified);
@@ -97,8 +97,8 @@
/*鐢熸垚妫�楠屾姤鍛�*/
@Override
- public void down(HttpServletResponse response, Integer id) {
- QualityInspect inspect = qualityInspectMapper.selectById(id);
+ public void down(HttpServletResponse response, QualityInspect qualityInspect) {
+ QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
String inspectType="";
switch (inspect.getInspectType()){
case 0:
@@ -111,7 +111,7 @@
inspectType="鍑哄巶妫�楠�";
break;
}
- List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
+ List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
int index = 1;
for (QualityInspectParam detail : paramList) {
detail.setIndex(index);
@@ -148,7 +148,7 @@
@Override
public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
- if (qualityInspectDto.getQualityInspectParams().size()>0) {
+ if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspectDto.getId());
--
Gitblit v1.9.3