From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilder.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilder.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilder.java
index bee442a..1fca7f8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilder.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilder.java
@@ -18,7 +18,7 @@
* 浜у搧妫�楠屽崟锛堢焊璐�"脳脳浜у搧璐ㄩ噺妫�楠屽崟"鐗堝紡锛塛ord 鏋勫缓鍣�
*
* 鐗堝紡锛氭爣棰橈紙鍏徃 + 浜у搧妫�楠屽崟锛夆啋 琛ㄥご淇℃伅 5 琛� 鈫� 妫�楠岄」鐩�/妫�楠岀粨鏋� 涓ゅ垪鐭╅樀 鈫�
- * 鍒ゅ畾缁撹/璐ㄦ涓撶敤绔狅紙鐣欑┖锛屾墦鍗板悗鎵嬪～锛夆啋 澶囨敞 鈫� 妫�楠�/澶嶆牳/鎵瑰噯绛惧瓧琛屻��
+ * 鍒ゅ畾缁撹锛堣嚜鍔ㄥ甫鍑烘楠岀粨鏋滐級/璐ㄦ涓撶敤绔狅紙鐣欑┖鐩栫珷锛夆啋 澶囨敞 鈫� 妫�楠�/澶嶆牳/鎵瑰噯绛惧瓧琛屻��
* 涓嶅惈鎶�鏈寚鏍囧垪锛涘垎缁勯」涓嶅睍绀猴紝褰曞叆椤瑰钩閾猴紱骞宠娴嬮噺澶氬�奸】鍙峰悎骞躲��
*/
public class MesQcProductReportWordBuilder {
@@ -51,7 +51,7 @@
writeTitle(doc, report);
writeHeaderTable(doc, report);
writeItemTable(doc, report);
- writeConclusionTable(doc);
+ writeConclusionTable(doc, report);
writeRemarkTable(doc, report);
writeSignLine(doc);
doc.write(out);
@@ -150,12 +150,14 @@
.orElse(EMPTY);
}
- // ========== 鍒ゅ畾缁撹 / 璐ㄦ涓撶敤绔狅紙鐣欑┖鍚庡～锛� ==========
+ // ========== 鍒ゅ畾缁撹 / 璐ㄦ涓撶敤绔� ==========
- private static XWPFTable writeConclusionTable(XWPFDocument doc) {
+ /** 鍒ゅ畾缁撹鑷姩甯﹀嚭妫�楠岀粨鏋滄枃妗堬紱璐ㄦ涓撶敤绔犵暀绌猴紝鎵撳嵃鍚庝汉宸ョ洊绔� */
+ private static XWPFTable writeConclusionTable(XWPFDocument doc, MesQcQcReportRespVO report) {
XWPFTable table = createTable(doc);
- XWPFTableRow row = addRow(table, valueLeftSpan("鍒ゅ畾缁撹锛�", 2), valueLeftSpan("璐ㄦ涓撶敤绔狅細", 2));
- // 棰勭暀鎵嬪啓/鐩栫珷楂樺害
+ String conclusion = notBlank(report.getCheckResultText()) ? report.getCheckResultText() : "";
+ XWPFTableRow row = addRow(table, valueLeftSpan("鍒ゅ畾缁撹锛�" + conclusion, 2), valueLeftSpan("璐ㄦ涓撶敤绔狅細", 2));
+ // 棰勭暀鐩栫珷楂樺害
setRowHeight(row, 2550);
return table;
}
--
Gitblit v1.9.3