优化榜单导入

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -560,10 +560,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                             int picHeight = 600;
                             int picWidth = 500;
                             Integer width = null;
-
                             Integer height = null;
-
-
                             if (map1.get("width") != null) {
                                 width = Integer.valueOf(String.valueOf(map1.get("width")));
                             }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/utils/VehiclePictureFolderUtils.java

@@ -5,7 +5,6 @@ import jnpf.util.StringUtil;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
-import org.junit.jupiter.api.Test;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -66,16 +65,18 @@ public class VehiclePictureFolderUtils {
                 if (substring.length()>=2){
                     vehiclePictureFolder.setDriverName(substring);
                 }
+            }else {
+                vehiclePictureFolder.setDriverName(substring);
             }
 
         }
         return vehiclePictureFolder;
     }
 
-    @Test
+//    @Test
-    public void test1(){ System.out.println(
+//    public void test1(){ System.out.println(
-            VehiclePictureFolderUtils.getVehiclePictureFolder("1豫AS0K91李高洋15797755804"));
+//            VehiclePictureFolderUtils.getVehiclePictureFolder("1-豫AS0K91-李高洋"));
-    }
+//    }