Explorar o código

修复模板问题

Lucien hai 1 ano
pai
achega
c0ee67f8b9

+ 2 - 0
src/main/java/com/keystar/plane/inspection/bo/PlaneInspectionPicBo.java

@@ -13,9 +13,11 @@ import lombok.Data;
 public class PlaneInspectionPicBo {
 
     //可见光图片minio地址(从bucket开始)
+    private String visibleId;
     private String visible;
 
     //红外minio地址(从bucket开始)
+    private String infraredId;
     private String infrared;
 
 }

+ 2 - 2
src/main/resources/template/report.ftl

@@ -9497,7 +9497,7 @@ AAAAAAAANUSwBwAAAAAAANQQwR4AAAAAAABQQwR7AAAAAAAAQA0R7AEAAAAAAAA1RLAHAAAAAAAA
                                                                                   wsp:rsidRDefault="00F825C9"
                                                                                   wsp:rsidP="00991E98"><w:pPr><w:pStyle w:val="KR3"/></w:pPr>
                     <w:r><w:pict><w:binData w:name="wordml://03000003.png" xml:space="preserve">${pic.infrared}
-</w:binData><v:shape id="图片 3" o:spid="_x0000_s2051" type="#_x0000_t75" alt="文本&#xA;&#xA;描述已自动生成"
+</w:binData><v:shape id=${pic.infraredId} o:spid="_x0000_s2051" type="#_x0000_t75" alt="文本&#xA;&#xA;描述已自动生成"
                      style="position:absolute;margin-left:-5.1pt;margin-top:14.25pt;width:413.9pt;height:232.85pt;z-index:4;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;mso-position-horizontal-relative:text;mso-position-vertical:absolute;mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;mso-width-relative:margin;mso-height-relative:margin"><v:imagedata src="wordml://03000003.png" o:title="文本&#xA;&#xA;描述已自动生成"/>
                         <w10:wrap type="topAndBottom"/></v:shape></w:pict></w:r>
                     <w:r wsp:rsidR="00F825C9"><w:rPr><w:rFonts w:hint="fareast"/><wx:font
@@ -9509,7 +9509,7 @@ AAAAAAAANUSwBwAAAAAAANQQwR4AAAAAAABQQwR7AAAAAAAAQA0R7AEAAAAAAAA1RLAHAAAAAAAA
                                                                                   wsp:rsidRDefault="00CD64B3"
                                                                                   wsp:rsidP="00991E98"><w:pPr><w:pStyle w:val="KR3"/></w:pPr>
                     <w:r><w:pict><w:binData w:name="wordml://03000003.png" xml:space="preserve">${pic.visible}
-</w:binData><v:shape id="图片 3" o:spid="_x0000_s2051" type="#_x0000_t75" alt="文本&#xA;&#xA;描述已自动生成"
+</w:binData><v:shape id=${pic.visibleId} o:spid="_x0000_s2051" type="#_x0000_t75" alt="文本&#xA;&#xA;描述已自动生成"
                      style="position:absolute;margin-left:-5.1pt;margin-top:14.25pt;width:413.9pt;height:232.85pt;z-index:4;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;mso-position-horizontal-relative:text;mso-position-vertical:absolute;mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;mso-width-relative:margin;mso-height-relative:margin"><v:imagedata src="wordml://03000003.png" o:title="文本&#xA;&#xA;描述已自动生成"/>
                         <w10:wrap type="topAndBottom"/></v:shape></w:pict></w:r>
                     <w:r wsp:rsidRPr="00CD64B3"><w:rPr><w:rFonts w:hint="fareast"/><wx:font wx:val="仿宋"/></w:rPr>