订单导入增加内容校验，去除保障平台产线

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderController.java

@@ -247,13 +247,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
             return this.validFail("导入订单数据不完整");
         }
 
-        if(!StringUtils.isBlank(orderInfo.get(3).toString())){
-            try{
-                DateUtil.stringToDate3(orderInfo.get(3).toString());
-            }catch (Exception e){
-                return this.validFail("导入订单数据第2行下单日期格式不正确");
-            }
-        }else{
+        if(null == DateUtil.stringToDate3(orderInfo.get(3).toString())){
             return this.validFail("导入订单数据第2行下单日期格式不正确");
         }
 
@@ -292,30 +286,17 @@ public class OrderController extends SuperController<OrderService, Long, Order,
                 }
                 String excelDeliveryTime = line.get(3).toString();
                 if(StringUtils.isBlank(maxdeliveryTime)){
-                    if(StringUtils.isNotBlank(excelDeliveryTime)){
-                        try{
-                            DateUtil.stringToDate3(maxdeliveryTime.toString());
-                        }catch (Exception e){
-                            return this.validFail("导入订单数据第" + lineCount + "行交付日期格式不正确");
-                        }
-
-                        maxdeliveryTime = excelDeliveryTime.toString();
-                    }else{
+                    if(null == DateUtil.stringToDate3(excelDeliveryTime.toString())){
                         return this.validFail("导入订单数据第" + lineCount + "行交付日期格式不正确");
                     }
+                    maxdeliveryTime = excelDeliveryTime.toString();
                 }else{
-                    if(StringUtils.isNotBlank(excelDeliveryTime)){
-                        try{
-                            DateUtil.stringToDate3(maxdeliveryTime.toString());
-                        }catch (Exception e){
-                            return this.validFail("导入订单数据第" + lineCount + "行交互日期格式不正确");
-                        }
-                        if(maxdeliveryTime.compareTo(excelDeliveryTime.toString()) < 0){
-                            maxdeliveryTime =  excelDeliveryTime.toString();
-                        }
-                    }else{
+                    if(null == DateUtil.stringToDate3(excelDeliveryTime.toString())){
                         return this.validFail("导入订单数据第" + lineCount + "行交付日期格式不正确");
                     }
+                    if(maxdeliveryTime.compareTo(excelDeliveryTime.toString()) < 0){
+                        maxdeliveryTime =  excelDeliveryTime.toString();
+                    }
                 }
                 orderProduct.put("furnaceBatchNo",furnaceBatchNoInfos[2]);
                 orderProduct.put("bomNum",line.get(2));