托书导出判空

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -607,6 +607,39 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 //总体积
 			 entity.setTotalVolume(tatolVolume);
 
+			 //判空
+			 if(oConvertUtils.isEmpty(entity.getUnitInOperation())){
+				 entity.setUnitInOperation(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getCustomsCode())){
+				 entity.setCustomsCode(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getDutyParagraph())){
+				 entity.setDutyParagraph(" ");
+			 }
+			 //海关
+			 if(oConvertUtils.isEmpty(entity.getExportPort())){
+				 entity.setExportPort(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getLatestDateOfShipment())){
+				 entity.setLatestDateOfShipment(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getTypeOfShipping())){
+				 entity.setTypeOfShipping(" ");
+			 } if(oConvertUtils.isEmpty(entity.getShippingOrderNumber())){
+				 entity.setShippingOrderNumber(" ");
+			 } if(oConvertUtils.isEmpty(entity.getTradeCountry())){
+				 entity.setTradeCountry(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getArriveInCountry())){
+				 entity.setArriveInCountry(" ");
+			 }
+			 if(oConvertUtils.isEmpty(entity.getDestinationPort())){
+				 entity.setDestinationPort(" ");
+			 }
+
+
+
 			 //String[] nameList = new String[]{"报关信息-报关单","报关信息-申报要素-成衣","报关信息-发票","报关信息-合同","报关信息-申报要素-面料","报关信息-装箱单"};
 
 			 if(testName.equals("报关信息-报关单")){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -92,7 +92,7 @@ public class SyShippingOrder {
     @ApiModelProperty(value = "经营单位地址")
 	private java.lang.String unitInOperationAddress;
 	/**装运期限*/
-	@Excel(name = "装运期限", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "装运期限", width = 20)
     @ApiModelProperty(value = "装运期限")
 	private String latestDateOfShipment;
 	/**最终船期*/