From 69c6770472178e64975806f8344c2e0260427c6e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 20 十二月 2024 14:18:01 +0800
Subject: [PATCH] cnas7模块+6部分模块(更新至 df6c60)
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 833dce9..dbb5e93 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
@@ -85,6 +85,9 @@
@Resource
private InsReportMapper insReportMapper;
+ @Resource
+ ProcessReportMapper processReportMapper;
+
@Value("${wordUrl}")
private String wordUrl;
@@ -244,11 +247,10 @@
put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
}}, finalUrl);
wordToPdf(finalUrl, sealUrl);
-
- InsOrder insOrder = new InsOrder();
- insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
- insOrder.setState(4);
- insOrderMapper.updateById(insOrder);
+ /*鏂板cnas7.8鎶ュ憡缁撴灉*/
+ ProcessReport processReport = new ProcessReport();
+ processReport.setInsReportCode(insReport.getCode());
+ processReportMapper.insert(processReport);
return insReportMapper.updateById(insReport);
}
@@ -365,10 +367,10 @@
if (insReportDto.getState() == 1) {
List<InsReportDto1> insReportDto1s = insReportDto.getInsReportDto1s();
for (InsReportDto1 insReportDto1 : insReportDto1s) {
- wordUtils.generateReport(insReportDto.getId(), insReportDto1);
+ if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())){
+ wordUtils.generateReport(insReportDto.getId(), insReportDto1);
+ }
}
- } else {
- //濡傛灉涓嶇敓鎴愬氨涓�鐩存寕鐫�
}
} else {
throw new ErrorException("璇ヨ鍗曡繕鏈粨鏉熻瘯楠�,鏃犳硶鐢熸垚鎶ュ憡!");
--
Gitblit v1.9.3