From d2d71a6bc8e445ee60b7be2667676138e277d676 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 六月 2024 17:41:08 +0800
Subject: [PATCH] 1. 修改走航报告自动输出模块
---
src/main/resources/templates/report-underway.ftl | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/report-underway.ftl b/src/main/resources/templates/report-underway.ftl
index 3b39b2d..73f9bad 100644
--- a/src/main/resources/templates/report-underway.ftl
+++ b/src/main/resources/templates/report-underway.ftl
@@ -28,6 +28,11 @@
<Relationship Id="imageId_${item_index}"
Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
Target="media/image_${item_index}.png" />
+ <#list item.subPictList as subItem>
+ <Relationship Id="imageId_sub_${item_index}-${subItem_index}"
+ Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
+ Target="media/image_sub_${item_index}-${subItem_index}.png" />
+ </#list>
</#list>
<#list summary as item>
<Relationship Id="imageId2_${item_index}"
@@ -1247,7 +1252,7 @@
<w:szCs w:val="28" />
<w:lang w:val="en-US" w:eastAsia="zh-CN" />
</w:rPr>
- <w:t>浠�${item.startTime}鑷�${item.endTime}锛�${item.factorName}鍑虹幇${item.exception}<#if item.relatedSceneName??>锛岀粨鍚堢洃娴嬫暟鎹彉鍖栧拰鍙楃偣鍙嶅悜婧簮锛�<#list item.relatedSceneName as scene>${scene}銆�</#list>绛夊彲鑳藉瓨鍦ㄦ薄鏌撻闄┿��<#else>銆�</#if></w:t>
+ <w:t>${item_index + 1}. 浠�${item.startTime}鑷�${item.endTime}锛�${item.factorName}鍑虹幇${item.exception}<#if item.relatedSceneName??>锛岀粨鍚堢洃娴嬫暟鎹彉鍖栧拰鍙楃偣鍙嶅悜婧簮锛�<#list item.relatedSceneName as scene>${scene}銆�</#list>绛夊彲鑳藉瓨鍦ㄦ薄鏌撻闄┿��<#else>銆�</#if></w:t>
</w:r>
</w:p>
<w:p>
@@ -1274,7 +1279,7 @@
<w:pict>
<v:shape id="_x0000_i1025_${item_index}" o:spt="75"
alt="f1725d6e3fb17a0e748045906f55ced" type="#_x0000_t75"
- style="height:222.8pt;width:414.65pt;" filled="f"
+ style="height:225pt;width:400pt;" filled="f"
o:preferrelative="t" stroked="f" coordsize="21600,21600">
<v:path />
<v:fill on="f" focussize="0,0" />
@@ -1288,6 +1293,87 @@
</w:pict>
</w:r>
</w:p>
+ <#if item.subPictList??>
+ <w:p>
+ <w:pPr>
+ <w:keepNext w:val="0" />
+ <w:keepLines w:val="0" />
+ <w:pageBreakBefore w:val="0" />
+ <w:widowControl w:val="0" />
+ <w:kinsoku />
+ <w:wordWrap />
+ <w:overflowPunct />
+ <w:topLinePunct w:val="0" />
+ <w:autoSpaceDE />
+ <w:autoSpaceDN />
+ <w:bidi w:val="0" />
+ <w:adjustRightInd />
+ <w:snapToGrid />
+ <w:ind w:firstLine="560" w:firstLineChars="200" />
+ <w:textAlignment w:val="auto" />
+ <w:rPr>
+ <w:rFonts w:hint="default" w:ascii="浠垮畫_GB2312" w:hAnsi="浠垮畫"
+ w:eastAsia="浠垮畫_GB2312"
+ w:cs="Times New Roman" />
+ <w:sz w:val="28" />
+ <w:szCs w:val="28" />
+ <w:lang w:val="en-US" w:eastAsia="zh-CN" />
+ </w:rPr>
+ </w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:hint="eastAsia" w:ascii="浠垮畫_GB2312" w:hAnsi="浠垮畫"
+ w:eastAsia="浠垮畫_GB2312"
+ w:cs="Times New Roman" />
+ <w:color w:val="000000" />
+ <w:sz w:val="28" />
+ <w:szCs w:val="28" />
+ <w:lang w:val="en-US" w:eastAsia="zh-CN" />
+ </w:rPr>
+ <w:t>鍏宠仈鍥犲瓙<#list item.subFactorName as subItem><#if (subItem_index > 0)>銆�</#if>${subItem}</#list>鏁版嵁閲忕骇濡備笅锛�</w:t>
+ </w:r>
+ </w:p>
+ <#list item.subPictList as subItem>
+ <w:p>
+ <w:pPr>
+ <w:jc w:val="center" />
+ <w:rPr>
+ <w:rFonts w:hint="default" w:ascii="浠垮畫_GB2312" w:hAnsi="浠垮畫"
+ w:eastAsia="浠垮畫_GB2312" />
+ <w:sz w:val="28" />
+ <w:szCs w:val="28" />
+ <w:highlight w:val="none" />
+ <w:lang w:val="en-US" w:eastAsia="zh-CN" />
+ </w:rPr>
+ </w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:hint="default" w:ascii="浠垮畫_GB2312" w:hAnsi="浠垮畫"
+ w:eastAsia="浠垮畫_GB2312" />
+ <w:sz w:val="28" />
+ <w:szCs w:val="28" />
+ <w:highlight w:val="none" />
+ <w:lang w:val="en-US" w:eastAsia="zh-CN" />
+ </w:rPr>
+ <w:pict>
+ <v:shape id="_x0000_i1025_sub_${item_index}-${subItem_index}" o:spt="75"
+ alt="f1725d6e3fb17a0e748045906f55ced" type="#_x0000_t75"
+ style="height:225pt;width:400pt;" filled="f"
+ o:preferrelative="t" stroked="f" coordsize="21600,21600">
+ <v:path />
+ <v:fill on="f" focussize="0,0" />
+ <v:stroke on="f" />
+ <v:imagedata r:id="imageId_sub_${item_index}-${subItem_index}"
+ o:title="f1725d6e3fb17a0e748045906f55ced" />
+ <o:lock v:ext="edit" aspectratio="t" />
+ <w10:wrap type="none" />
+ <w10:anchorlock />
+ </v:shape>
+ </w:pict>
+ </w:r>
+ </w:p>
+ </#list>
+ </#if>
</#list>
<w:p>
<w:pPr>
@@ -1417,7 +1503,7 @@
<w:pict>
<v:shape id="_x0000_i1026_${item_index}" o:spt="75"
alt="f1725d6e3fb17a0e748045906f55ced" type="#_x0000_t75"
- style="height:222.8pt;width:414.65pt;" filled="f"
+ style="height:225pt;width:400pt;" filled="f"
o:preferrelative="t" stroked="f" coordsize="21600,21600">
<v:path />
<v:fill on="f" focussize="0,0" />
@@ -1756,8 +1842,13 @@
</pkg:part>
<#list exceptions as item>
<pkg:part pkg:name="/word/media/image_${item_index}.png" pkg:contentType="image/png">
- <pkg:binaryData>${item.pict}</pkg:binaryData>
+ <pkg:binaryData>${item.mainPict}</pkg:binaryData>
</pkg:part>
+ <#list item.subPictList as subItem>
+ <pkg:part pkg:name="/word/media/image_sub_${item_index}-${subItem_index}.png" pkg:contentType="image/png">
+ <pkg:binaryData>${subItem}</pkg:binaryData>
+ </pkg:part>
+ </#list>
</#list>
<#list summary as item>
<pkg:part pkg:name="/word/media/image2_${item_index}.png" pkg:contentType="image/png">
--
Gitblit v1.9.3