From 5ce26886a49d6f7fe283ca44f450bbe2b9f2e926 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 三月 2025 18:10:45 +0800
Subject: [PATCH] 复核结束闭环+电性能+辐射性能
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 8 +++++++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 8 --------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 6 ++++++
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 22d82a0..5497fbe 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1204,6 +1204,9 @@
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
createReport(insOrder.getId(),insReportDto1s);
+ //璇ヨ鍗曢棴鐜�
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
break;
}
}
@@ -1291,6 +1294,9 @@
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
createReport(insOrder.getId(),insReportDto1s);
+ //璁㈠崟闂幆
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
break;
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 81e9fb9..a3f54d6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -253,14 +253,6 @@
ProcessReport processReport = new ProcessReport();
processReport.setInsReportCode(insReport.getCode());
processReportMapper.insert(processReport);
- /*妫�楠屽崟缁撴潫*/
- List<InsReport> insReports = insReportMapper.selectList(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getInsOrderId, insReport.getInsOrderId()));
- List<Integer> list = insReports.stream().map(InsReport::getIsRatify).distinct().collect(Collectors.toList());
- if (list.size() == 1 && list.contains(1)) {
- InsOrder insOrder = insOrderMapper.selectById(insReport.getInsOrderId());
- insOrder.setState(4);
- insOrderMapper.updateById(insOrder);
- }
return 0;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index b57dcb6..1825187 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2687,7 +2687,13 @@
for (InsProduct insPro : insProducts) {
InsProductWordDto insProductWordDto = new InsProductWordDto();
insProductWordDto.setIndex(index1+"");//搴忓彿
- insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ if (insPro.getInspectionItem().contains("鐢佃矾璇曢獙")){
+ insProductWordDto.setTerm("鐢垫�ц兘鍙傛暟-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }else if (insPro.getInspectionItem().contains("杈愬皠璇曢獙")){
+ insProductWordDto.setTerm("杈愬皠鎬ц兘鍙傛暟"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }else {
+ insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }
if (ObjectUtils.isNotNull(insPro.getInsResult()) && insPro.getInsResult()==0) {
insProductWordDto.setResult("涓嶅悎鏍�");//缁撹
} else {
--
Gitblit v1.9.3