From 56fe897d3e06bfa1e1105980d0044e6e67b2a484 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 23 十月 2026 17:44:20 +0800
Subject: [PATCH] feat(report): 实现浏览器内报告DOCX编辑功能
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index dcd6d1e..797cc86 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -359,6 +359,9 @@
"妯℃澘ID " + snapshot.getTemplateId());
if (snapshot.getDetectionTime() == null) {
collect.add("璇烽�夋嫨鈥�" + templateName + "鈥濈殑妫�娴嬫椂闂�");
+ } else if (snapshot.getDetectionEndTime() != null
+ && snapshot.getDetectionEndTime().isBefore(snapshot.getDetectionTime())) {
+ collect.add("鈥�" + templateName + "鈥濈殑妫�娴嬬粨鏉熸棩鏈熶笉鑳芥棭浜庡紑濮嬫棩鏈�");
}
if (StringUtils.isBlank(snapshot.getDetectionPlace())) {
collect.add("璇峰～鍐欌��" + templateName + "鈥濈殑妫�娴嬪湴鐐�");
@@ -1655,6 +1658,8 @@
refreshed.setInsOrderId(orderId);
refreshed.setTemplateId(templateId);
refreshed.setNumber(standardTemplate == null ? oldSnapshot.getNumber() : standardTemplate.getNumber());
+ refreshed.setStandardRequirement(oldSnapshot == null
+ ? standardTemplate.getStandardRequirement() : oldSnapshot.getStandardRequirement());
refreshed.setName(standardTemplate == null ? oldSnapshot.getName() : standardTemplate.getName());
refreshed.setRemark(standardTemplate == null ? oldSnapshot.getRemark() : standardTemplate.getRemark());
refreshed.setThing(standardTemplate == null ? oldSnapshot.getThing() : standardTemplate.getThing());
@@ -1665,6 +1670,7 @@
refreshed.setHumidity(templateHumidityMap.get(templateId));
// 鍒锋柊妯℃澘缁撴瀯鏃跺繀椤讳繚鐣欐楠岄樁娈靛～鍐欑殑涓氬姟鏁版嵁锛岄伩鍏嶈繘鍏ュ鏍稿悗鍥炴樉涓虹┖銆�
refreshed.setDetectionTime(oldSnapshot == null ? null : oldSnapshot.getDetectionTime());
+ refreshed.setDetectionEndTime(oldSnapshot == null ? null : oldSnapshot.getDetectionEndTime());
refreshed.setDetectionPlace(oldSnapshot == null ? null : oldSnapshot.getDetectionPlace());
refreshed.setInsResult(oldSnapshot == null ? null : oldSnapshot.getInsResult());
Integer templateSort = templateSortMap.get(templateId);
@@ -2004,7 +2010,8 @@
if (Objects.equals(report.getIsRatify(), 1)) {
throw new ErrorException("宸叉壒鍑嗘姤鍛婁笉鑳介噸鏂扮敓鎴�");
}
- if (StringUtils.isNotBlank(report.getUrlS())) {
+ // urlS 鍚屾椂鐢ㄤ簬浜哄伐涓婁紶鍜屽鏍搁〉闈繚瀛樼殑 Word锛涘彧鏈変汉宸ヤ笂浼犻渶瑕佸厛鎵嬪姩鍒囧洖绯荤粺鎶ュ憡銆�
+ if (StringUtils.isNotBlank(report.getUrlS()) && !isBrowserEditedReportUrl(report.getUrlS())) {
throw new ErrorException("褰撳墠鎶ュ憡宸叉墜鍔ㄤ笂浼狅紝璇峰厛杩樺師涓虹郴缁熸姤鍛婂悗鍐嶉噸鏂扮敓鎴�");
}
if (report.getInsOrderId() == null) {
@@ -2048,7 +2055,12 @@
.eq(InsReport::getId, reportId)
.set(InsReport::getWriteTime, report.getWriteTime())
.set(InsReport::getIsPass, report.getIsPass())
+ .set(InsReport::getUrlS, null)
.set(InsReport::getTempUrlPdf, "/word/" + tempPdfName));
+ }
+
+ private static boolean isBrowserEditedReportUrl(String url) {
+ return url != null && url.matches("(?i)^/word/(?:edited|reviewed)-[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}\\.docx$");
}
private Map<String, Object> buildExistingReportMarks(InsReport report) {
@@ -3613,7 +3625,8 @@
.eq(InsOrderStandardTemplate::getInsOrderId, orderId)
.orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId));
List<LocalDate> detectionDates = templateSnapshots.stream()
- .map(InsOrderStandardTemplate::getDetectionTime)
+ .flatMap(snapshot -> java.util.stream.Stream.of(
+ snapshot.getDetectionTime(), snapshot.getDetectionEndTime()))
.filter(Objects::nonNull)
.collect(Collectors.toList());
String insTime = formatReportTestDate(detectionDates);
@@ -3629,7 +3642,7 @@
List<Map<String, String>> finalDeviceList = deviceList;
String finalModelStr = modelStr;
- // 鐩寸粦妯℃澘璁㈠崟娌℃湁 ins_product锛屾娴嬮」鐩�佸崟浣嶅拰缁撴灉鍧囦粠璁㈠崟妯℃澘蹇収涓幏鍙栥��
+ // 鐩寸粦妯℃澘璁㈠崟娌℃湁 ins_product锛屾娴嬮」鐩�佹爣鍑嗚姹傚�煎拰缁撴灉鍧囦粠璁㈠崟妯℃澘蹇収涓幏鍙栥��
List<Map<String, String>> detectionResultRows = directTemplateOrder
? buildTemplateDetectionResultRows(orderId)
: buildDetectionResultRows(samples);
@@ -3811,7 +3824,7 @@
}
/**
- * 鏂扮増妫�娴嬫姤鍛婄殑缁撴灉琛ㄥ浐瀹氫负鍥涘垪锛氬簭鍙枫�佹娴嬮」鐩�佸崟浣嶃�佹娴嬬粨鏋溿��
+ * 鏂扮増妫�娴嬨�佹楠屾姤鍛婂叡鐢ㄧ粨鏋滄暟鎹紱鏍囧噯瑕佹眰鍊煎彇鑷師濮嬭褰曟ā鏉块厤缃��
*/
private List<Map<String, String>> buildDetectionResultRows(List<SampleProductDto> samples) {
List<Map<String, String>> rows = new ArrayList<>();
@@ -3820,6 +3833,7 @@
}
boolean multipleSamples = samples.size() > 1;
+ Map<Integer, String> requirementsByTemplate = new HashMap<>();
int sequence = 1;
for (SampleProductDto sample : samples) {
if (CollectionUtils.isEmpty(sample.getInsProduct())) {
@@ -3840,8 +3854,15 @@
Map<String, String> row = new LinkedHashMap<>();
row.put("seq", String.valueOf(sequence++));
- row.put("itemName", itemName);
+ row.put("itemName", formatReportItemWithUnit(itemName, product.getUnit()));
row.put("unit", defaultReportText(product.getUnit(), "/"));
+ String requirement = product.getTemplateId() == null ? null
+ : requirementsByTemplate.computeIfAbsent(product.getTemplateId(), templateId -> {
+ StandardTemplate sourceTemplate = standardTemplateService.getById(templateId);
+ return defaultReportText(sourceTemplate == null ? null
+ : sourceTemplate.getStandardRequirement(), "/");
+ });
+ row.put("standardRequirement", defaultReportText(requirement, "/"));
row.put("result", defaultReportText(product.getLastValue(), "/"));
row.put("inspectionConclusion", formatInspectionConclusion(product.getInsResult()));
rows.add(row);
@@ -3867,7 +3888,8 @@
Wrappers.<InsOrderStandardTemplate>lambdaQuery()
.eq(InsOrderStandardTemplate::getInsOrderId, orderId)
.orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId));
- context.setDetectionDates(snapshots.stream().map(InsOrderStandardTemplate::getDetectionTime)
+ context.setDetectionDates(snapshots.stream().flatMap(snapshot -> java.util.stream.Stream.of(
+ snapshot.getDetectionTime(), snapshot.getDetectionEndTime()))
.filter(Objects::nonNull).distinct().sorted().collect(Collectors.toList()));
List<Integer> deviceIds = insOrderTemplateDeviceMapper.selectDeviceIdsByOrderId(orderId);
if (CollectionUtils.isNotEmpty(deviceIds)) {
@@ -3895,6 +3917,12 @@
List<Map<String, String>> rows = new ArrayList<>();
int sequence = 1;
for (InsOrderStandardTemplate snapshot : snapshots) {
+ String standardRequirement = snapshot.getStandardRequirement();
+ // 鍏煎鏂板璇ュ瓧娈靛墠涓嬪崟鐨勬棫璁板綍锛涙湁蹇収鏃跺缁堜互璁㈠崟淇濆瓨鐨勫�间负鍑嗐��
+ if (StringUtils.isBlank(standardRequirement) && snapshot.getTemplateId() != null) {
+ StandardTemplate sourceTemplate = standardTemplateService.getById(snapshot.getTemplateId());
+ standardRequirement = sourceTemplate == null ? null : sourceTemplate.getStandardRequirement();
+ }
List<TemplateExportCell> exportCells = getTemplateExportCells(snapshot.getThing());
JSONObject recordValues = StrUtil.isBlank(snapshot.getRecordValues())
? new JSONObject() : JSON.parseObject(snapshot.getRecordValues());
@@ -3913,8 +3941,10 @@
row.put("seq", String.valueOf(sequence++));
String reportItemName = defaultReportText(itemName,
defaultReportText(snapshot.getName(), "妯℃澘ID " + snapshot.getTemplateId()));
- row.put("itemName", formatExportItemName(reportItemName));
+ row.put("itemName", formatReportItemWithUnit(
+ formatExportItemName(reportItemName), unit));
row.put("unit", defaultReportText(unit, "/"));
+ row.put("standardRequirement", defaultReportText(standardRequirement, "/"));
row.put("result", result);
row.put("inspectionConclusion", formatInspectionConclusion(snapshot.getInsResult()));
rows.add(row);
@@ -4090,6 +4120,14 @@
return itemName.replaceAll("骞冲潎鍊糪\s*[锛�,]?\\s*", "");
}
+ private static String formatReportItemWithUnit(String itemName, String unit) {
+ if (StringUtils.isBlank(unit) || "/".equals(unit.trim())
+ || itemName.contains(unit.trim())) {
+ return itemName;
+ }
+ return itemName + "锛�" + unit.trim();
+ }
+
private static String getMapText(Map<String, String> map, String... keys) {
if (map == null) {
return null;
--
Gitblit v1.9.3