From 9ea2e9763d84581ac3b2040c27cf30f0d53468da Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 15:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 57 +++++++++++++--------------------------------------------
1 files changed, 13 insertions(+), 44 deletions(-)
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 b2633a8..f29bedf 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -64,22 +64,6 @@
qualityInspectParam.setInspectId(qualityInspect.getId());
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
-// String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
-// //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
-// List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
-// .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
-// if (qualityTestStandards.size()>0){
-//
-// List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
-// QualityInspectParam qualityInspectParam = new QualityInspectParam();
-// BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
-// qualityInspectParam.setInspectId(qualityInspect.getId());
-// return qualityInspectParam;
-// }).collect(Collectors.toList());
-// qualityInspectParamService.saveBatch(qualityInspectParams);
-// }else{
-// throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
-// }
return 0;
}
@@ -95,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);
@@ -113,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:
@@ -127,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);
@@ -149,6 +133,7 @@
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
"妫�楠屾姤鍛�", "UTF-8");
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
@@ -164,32 +149,16 @@
@Override
public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
- if (qualityInspectDto.getQualityInspectParams().size()>0) {
- qualityInspectParamService.updateBatchById(qualityInspectDto.getQualityInspectParams());
+ if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
+ qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
+ for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
+ qualityInspectParam.setInspectId(qualityInspectDto.getId());
+ }
+ qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
}
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
return qualityInspectMapper.updateById(qualityInspect);
-
-// String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
-// //鍏堝垹闄ゆ墍鏈夋楠屽弬鏁板啀鏂板
-// qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
-// .eq(QualityInspectParam::getInspectId,qualityInspect.getId()));
-// //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
-// List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
-// .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
-// if (qualityTestStandards.size()>0){
-// List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
-// QualityInspectParam qualityInspectParam = new QualityInspectParam();
-// BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
-// qualityInspectParam.setInspectId(qualityInspect.getId());
-// return qualityInspectParam;
-// }).collect(Collectors.toList());
-// qualityInspectParamService.saveBatch(qualityInspectParams);
-// }else{
-// throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
-// }
-// return qualityInspectMapper.updateById(qualityInspect);
}
@Override
--
Gitblit v1.9.3