Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/OrderBaseStatusEnum.java

@@ -56,6 +56,7 @@ public enum OrderBaseStatusEnum implements BaseEnum {
      LRCD("LRCD","录入存档"),
     FWQX("FWQX","服务取消"),
     FL("FL","分流3.0"),
+    YWGO("YWGO","已完工"),
     ;
 
     @EnumValue

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -839,7 +839,7 @@ public class OrderBaseExcelLogic {
         List<PgOrderProduct> pgOrderProducts = new ArrayList<>();
         List<PgOrderWorker> pgOrderWorkers = new ArrayList<>();
 
-        int index = 0;
+        int index = 1;
         for (Object o : rows) {
             ++index;
             String errPrefix = "第" + (index) + "行 ";
@@ -885,7 +885,7 @@ public class OrderBaseExcelLogic {
             String workerId = row.get(36);
             String workerName = row.get(37);
             String managerGroup = row.get(38);
-            String operateEntity = row.get(39);
+
 
             if (userMobile.length() > 11) {
                 throw new RemoteServiceException(errPrefix + "请输入正确的客户手机号");
@@ -1029,7 +1029,13 @@ public class OrderBaseExcelLogic {
 
             pgOrderBase.setOverDate(overDateN);
             pgOrderBase.setManagerName(managerGroup);
-            pgOrderBase.setOperateEntity(operateEntity);
+
+            if (row.size() > 39) {
+                String operateEntity = row.get(39);
+                pgOrderBase.setOperateEntity(operateEntity);
+            }
+
+
 
 
             if (adminWebsitWorker != null) {
@@ -1079,6 +1085,7 @@ public class OrderBaseExcelLogic {
                 pgOrderProduct.setProductName(pSize);
                 pgOrderProducts.add(pgOrderProduct);
             }
+            addPgOrderBase.add(pgOrderBase);
             pgOrderBase.insertOrUpdate();
 
         }