From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index df1d601..e8c52f0 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -335,6 +335,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -524,25 +525,25 @@
public void exportSuperviseDetailRecord(Integer superviseDetailsId, HttpServletResponse response) {
QualitySuperviseDetailsRecord recordDto = qualitySuperviseDetailsRecordMapper.selectSuperviseDetailRecord(superviseDetailsId);
- //鑾峰彇鎶�鏈礋璐ｄ汉鐨勭鍚嶅湴鍧�
- String ratifyUrl = null;
- if (recordDto.getRatifyUserId() != null) {
- ratifyUrl = userMapper.selectById(recordDto.getRatifyUserId()).getSignatureUrl();
- if (StringUtils.isBlank(ratifyUrl)) {
- throw new ErrorException("鎵句笉鍒版妧鏈礋璐ｄ汉鐨勭鍚�");
- }
+ // 鏌ヨ妫�娴嬩汉鍛�
+ User tserUser = new User();
+ if (StringUtils.isNotBlank(recordDto.getTestMember())) {
+ tserUser = userMapper.selectOne(Wrappers.<User>lambdaQuery()
+ .eq(User::getName, recordDto.getTestMember())
+ .last("limit 1"));
}
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/supervision-detail-record.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
- String finalRatifyUrl = ratifyUrl;
+ User finalTserUser = tserUser;
XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("supervision", recordDto);
+ put("testMemberUrl", UserUtils.getFinalUserSignatureUrl(finalTserUser.getId()));
put("supervisoruUrl", UserUtils.getFinalUserSignatureUrl(recordDto.getSupervisor()));
- put("technicalDirectorUrl", StringUtils.isNotBlank(finalRatifyUrl) ? Pictures.ofLocal(imgUrl + "/" + finalRatifyUrl).create() : null);
+ put("technicalDirectorUrl", UserUtils.getFinalUserSignatureUrl(recordDto.getRatifyUserId()));
put("technicalDirectorDateUrl", recordDto.getRatifyTime() != null ?
Pictures.ofStream(DateImageUtil.createDateImage(recordDto.getRatifyTime())).create() : null);
}});
@@ -557,6 +558,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -875,6 +877,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -1253,6 +1256,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
--
Gitblit v1.9.3