From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
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 dbb5e93..4451297 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
@@ -41,6 +41,7 @@
import org.apache.logging.log4j.util.Strings;
import org.apache.poi.xwpf.usermodel.*;
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
@@ -85,8 +86,8 @@
@Resource
private InsReportMapper insReportMapper;
- @Resource
- ProcessReportMapper processReportMapper;
+ @Autowired
+ ProcessReportMapper1 processReportMapper;
@Value("${wordUrl}")
private String wordUrl;
@@ -229,6 +230,7 @@
insReport.setState(0);//鎻愪氦鐘舵�佹敼涓哄緟鎻愪氦
return insReportMapper.updateById(insReport);
}
+ insReportMapper.updateById(insReport);
//鑾峰彇鎵瑰噯浜虹殑绛惧悕鍦板潃
String signatureUrl;
try {
@@ -251,7 +253,15 @@
ProcessReport processReport = new ProcessReport();
processReport.setInsReportCode(insReport.getCode());
processReportMapper.insert(processReport);
- return insReportMapper.updateById(insReport);
+ /*妫�楠屽崟缁撴潫*/
+ 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;
}
@Override
--
Gitblit v1.9.3