需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -427,9 +427,9 @@ public class OrderBaseLogic {
             throw new RemoteServiceException("暂无权限接单");
         }
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
-        if (!(StringUtils.equals(pgOrderBase.getOrderStatus(), OrderBaseStatusEnum.DJD.getKey())
+        if (!pgOrderBase.getIsImportExcel() && (!(StringUtils.equals(pgOrderBase.getOrderStatus(), OrderBaseStatusEnum.DJD.getKey())
                 || StringUtils.equals(pgOrderBase.getOrderStatus(), OrderBaseStatusEnum.DSM.getKey())
-                || StringUtils.equals(pgOrderBase.getOrderStatus(), OrderBaseStatusEnum.YZP.getKey())
+                || StringUtils.equals(pgOrderBase.getOrderStatus(), OrderBaseStatusEnum.YZP.getKey()))
         )) {
             throw new RemoteServiceException("当前状态不可接单");
         }
@@ -477,10 +477,12 @@ public class OrderBaseLogic {
         }
 
 
-        pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
-        pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
-        pgOrderBase.setWorkerReceTime(new Date());
-        pgOrderBase.updateById();
+        if (!pgOrderBase.getIsImportExcel()) {
+            pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
+            pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
+            pgOrderBase.setWorkerReceTime(new Date());
+            pgOrderBase.updateById();
+        }
 
         orderLogLogic.addLog(orderBaseId, "接收工单", "主要工程师【" + one.getWorkerName() + "】确认接单" + joinSlaveStr, one.getWebsitName());
     }