需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.bean.listvo.workorder;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.enums.workorder.SaleTypeEnum;
+import com.gree.mall.manager.plus.entity.PgOrderBase;
 import com.gree.mall.manager.plus.entity.PgOrderFlag;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.util.List;
 
 @ZfireField(tbName = "a")
 @Data
-public class OrderBaseVO     {
+public class OrderBaseVO   extends PgOrderBase {
 
     @ZfireField(sortNum = 1,isQuery = false, ignoreSelect = true)
     @ApiModelProperty(value="服务单标识")
@@ -24,6 +25,10 @@ public class OrderBaseVO     {
 //    @ApiModelProperty(value = "所属商户")
 //    private String companyWechatName;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "是否为4.0工单导入 true/false")
+    private Boolean isImportExcel;
+
 
     @ZfireField(sortNum = 3)
     @ApiModelProperty(value = "网点编号")

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

@@ -636,7 +636,11 @@ public class ChangeOrderLogic {
                         .eq(WebsitDispatch::getOrderSmallId, pgOrderBase.getOrderSmallType())
                         .last("limit 1").one();
 
+
+
                 pgOrderBase.setWebsitId(websitDispatch.getWebsitId());
+                pgOrderBase.setOrderStatus(OrderBaseStatusEnum.DJD.getKey());
+                pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.DJD.getRemark());
                 pgOrderBase.setWebsitName(websitDispatch.getWebsitName());
                 pgOrderBase.setDispatchWebsitTime(new Date());
                 pgOrderBase.updateById();