徐明浩

定点测厚-处理pdf导出时数据为空的情况下无法导出问题

master/src/main/java/com/ruoyi/project/sems/controller/TMeasureThicknessController.java

@@ -199,29 +199,33 @@ public class TMeasureThicknessController extends BaseController
             }
             map.put("measure", measureThicknessEntity);
             logger.info("measure:" + measureThicknessEntity);
-            String[] photos =  measureThicknessEntity.getPhoto().split(",");
-            if (photos.length == 1) {
-                map.put("photo1", photos[0].replaceAll("/profile/",""));
-            }else if (photos.length == 2) {
-                map.put("photo1", photos[0].replaceAll("/profile/",""));
-                map.put("photo2", photos[1].replaceAll("/profile/",""));
-            }else if (photos.length == 3) {
-                map.put("photo1", photos[0].replaceAll("/profile/",""));
-                map.put("photo2", photos[1].replaceAll("/profile/",""));
-                map.put("photo3", photos[2].replaceAll("/profile/",""));
+            if(StringUtils.isNotEmpty(measureThicknessEntity.getPhoto())){
+                String[] photos =  measureThicknessEntity.getPhoto().split(",");
+                if (photos.length == 1) {
+                    map.put("photo1", photos[0].replaceAll("/profile/",""));
+                }else if (photos.length == 2) {
+                    map.put("photo1", photos[0].replaceAll("/profile/",""));
+                    map.put("photo2", photos[1].replaceAll("/profile/",""));
+                }else if (photos.length == 3) {
+                    map.put("photo1", photos[0].replaceAll("/profile/",""));
+                    map.put("photo2", photos[1].replaceAll("/profile/",""));
+                    map.put("photo3", photos[2].replaceAll("/profile/",""));
+                }
+            }
+            if(StringUtils.isNotEmpty(measureThicknessEntity.getLocationUrl())){
+                String[] locationUrls =  measureThicknessEntity.getLocationUrl().split(",");
+                if (locationUrls.length == 1) {
+                    map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
+                }else if (locationUrls.length == 2) {
+                    map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
+                    map.put("locationUrl2", locationUrls[1].replaceAll("/profile/",""));
+                    logger.info(locationUrls[0]);
+                }else if (locationUrls.length == 3) {
+                    map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
+                    map.put("locationUrl2", locationUrls[1].replaceAll("/profile/",""));
+                    map.put("locationUrl3", locationUrls[2].replaceAll("/profile/",""));
+                }
             }
-            String[] locationUrls =  measureThicknessEntity.getLocationUrl().split(",");
-            if (locationUrls.length == 1) {
-                map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
-            }else if (locationUrls.length == 2) {
-                map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
-                map.put("locationUrl2", locationUrls[1].replaceAll("/profile/",""));
-            logger.info(locationUrls[0]);
-        }else if (locationUrls.length == 3) {
-            map.put("locationUrl1", locationUrls[0].replaceAll("/profile/",""));
-            map.put("locationUrl2", locationUrls[1].replaceAll("/profile/",""));
-            map.put("locationUrl3", locationUrls[2].replaceAll("/profile/",""));
-        }
         //测量记录分行
         List<TMeasureRecord> measureRecords = tMeasureRecordService.queryRecords(id);
         List<List<TMeasureRecord>> result = new ArrayList<List<TMeasureRecord>>();

master/src/main/resources/freeMaker/measureFMaker.ftl

@@ -56,7 +56,7 @@
 					</td>
 					<td colspan="5" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.plantCode}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.plantCode??>${measure.plantCode}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -69,7 +69,7 @@
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.unitCode}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.unitCode??>${measure.unitCode}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -82,7 +82,7 @@
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.tagno}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.tagno??>${measure.tagno}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -95,7 +95,7 @@
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.position}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.position??>${measure.position}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -110,7 +110,7 @@
 					</td>
 					<td colspan="9" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.recorder}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.recorder??>${measure.recorder}</#if></span>
 						</p>
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -123,7 +123,7 @@
 					</td>
 					<td colspan="5" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.recorderDate?string("yyyy年MM月dd日")}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.recorderDate??>${measure.recorderDate?string("yyyy年MM月dd日")}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -138,7 +138,7 @@
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.equipmentName}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.equipmentName??>${measure.equipmentName}</#if></span>
 						</p>
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -151,7 +151,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.material}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.material??>${measure.material}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -164,7 +164,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.corAllowance}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.corAllowance??>${measure.corAllowance}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -179,7 +179,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.originalThickness}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.originalThickness??>${measure.originalThickness}</#if></span>
 						</p>
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -192,7 +192,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.medium}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.medium??>${measure.medium}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -205,7 +205,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.pressure}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.pressure??>${measure.pressure}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -220,7 +220,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.specification}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.specification??>${measure.specification}</#if></span>
 						</p>
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -233,7 +233,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.flowRate}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.flowRate??>${measure.flowRate}</#if></span>
 						</p>
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -246,7 +246,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.temperature}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.temperature??>${measure.temperature}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -307,7 +307,7 @@
 					</td>
 					<td colspan="12" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.corrosionType}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.corrosionType??>${measure.corrosionType}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -414,7 +414,7 @@
 					</td>
 					<td colspan="12" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.analysis}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.analysis??>${measure.analysis}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -437,7 +437,7 @@
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.nominalTickness}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.nominalTickness??>${measure.nominalTickness}</#if></span>
 						</p>
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -450,7 +450,7 @@
 					</td>
 					<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:8.82%">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.thicknessMin}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.thicknessMin??>${measure.thicknessMin}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -631,7 +631,7 @@
 					</td>
 					<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${measure.stCorrosion}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.stCorrosion??>${measure.stCorrosion}</#if></span>
 						</p>
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -647,7 +647,7 @@
 					</td>
 					<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${measure.ltCorrosion}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.ltCorrosion??>${measure.ltCorrosion}</#if></span>
 						</p>
 					</td>
 					<td colspan="4" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
@@ -663,7 +663,7 @@
 					</td>
 					<td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:8.82%">
 						<p style="margin:0pt; text-align:center">
-							<span style="font-family:SimSun; font-size:10pt">${measure.estRemain}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.estRemain??>${measure.estRemain}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -703,7 +703,7 @@
 					</td>
 					<td colspan="12" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.methodCause}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.methodCause??>${measure.methodCause}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -718,7 +718,7 @@
 					</td>
 					<td colspan="12" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">${measure.effectTracing}</span>
+							<span style="font-family:SimSun; font-size:10pt"><#if measure.effectTracing??>${measure.effectTracing}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -733,10 +733,10 @@
 					</td>
 					<td colspan="12" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle">
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">提出人：${measure.raiser}</span>
+							<span style="font-family:SimSun; font-size:10pt">提出人：<#if measure.raiser??>${measure.raiser}</#if></span>
 						</p>
 						<p style="margin:0pt">
-							<span style="font-family:SimSun; font-size:10pt">提出时间：${measure.raiserDate?string("yyyy年MM月dd日")}</span>
+							<span style="font-family:SimSun; font-size:10pt">提出时间：<#if measure.raiserDate??>${measure.raiserDate?string("yyyy年MM月dd日")}</#if></span>
 						</p>
 					</td>
 				</tr>
@@ -910,4 +910,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>