diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
index e729b1de..31943fb9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
@@ -333,7 +333,12 @@ public class ExportDeviceHelper {
                         ImportExcelField excelField = new ImportExcelField();
                         excelField.setCellFirst(optionParentDrawingNoName);
                         excelField.setCellSecond(String.format("%s %s", optionChildDrawingNoName, opChildName));
-                        excelField.setCellThird(String.format("%s %s：（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选"));
+                        if(StrUtil.isEmpty(item3.getDrawingNo())) {
+                            excelField.setCellThird(String.format("%s：（%s）", item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选"));
+                        }else {
+                            excelField.setCellThird(String.format("%s：%s（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选"));
+
+                        }
                         items.add(excelField);
 
                     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
index 642a901b..d749c68f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
@@ -23,11 +23,11 @@ public class OptionalEbomConfigListQuery extends   BasePageQuery  implements Ser
 
 
     @ApiModelProperty(value = "开始时间")
-    private Date startDate;
+    private String startDate;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Date endDate;
+    private String endDate;
 
     //状态
     private Integer  editStatus;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
index 0514ca36..a74d01c4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
@@ -63,9 +63,16 @@ public class OptionalExcelService {
             }
 
             optionalEbomImportLevel2Dto.getChild().add(levelDto3);
-            String[] optionName1 = item.getCellThird().trim().split("：");
-            String materialName = optionName1[1];
-            levelDto3.setDrawingNo(optionName1[0]);
+            String cloumn3=item.getCellThird().trim();
+            String materialName;
+            if(cloumn3.contains("：")) {
+                String[] optionName1 = item.getCellThird().trim().split("：");
+                  materialName = optionName1[1];
+                levelDto3.setDrawingNo(optionName1[0]);
+
+            }else{
+                materialName=cloumn3;
+            }
             //  levelDto3.setMaterialName(optionName1[1]);
             levelDto3.setLineNo(item.getLineNo());