简易订单修改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -37,7 +37,8 @@
 
     <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT bmd.sid AS virtualOrderSid,
+        SELECT
+        bmd.sid AS virtualOrderSid,
         bmd.billNo AS virtualOrderId,
         bmd.createDate AS virtualOrderDate,
         bmd.depositBillTypeKey as virtualOrderType,
@@ -58,12 +59,14 @@
         </where>
         <if test="name != '' and name != null">
             UNION ALL
-            SELECT bmd.sid AS virtualOrderSid,
+            SELECT
+            bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
             bmd.depositBillTypeKey as virtualOrderType,
             bmd.staffName AS sellerName,
-            bmd.nodeState AS virtualOrderState,
+            bmd.orgName,
+            if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
             bmd.remarks
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
@@ -77,12 +80,14 @@
                 </if>
             </where>
             UNION ALL
-            SELECT bmd.sid AS virtualOrderSid,
+            SELECT
+            bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
             bmd.depositBillTypeKey as virtualOrderType,
             bmd.staffName AS sellerName,
-            bmd.nodeState AS virtualOrderState,
+            bmd.orgName,
+            if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
             bmd.remarks
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,8 @@ public class DepositVehicleDetailVo implements Vo {
     @ApiModelProperty(value = "虚拟订单编号")
     private String virtualOrderId;
     @ApiModelProperty(value = "制单日期")
-    private String virtualOrderDate;
+    @JsonProperty("virtualOrderDate")
+    private String createDate;
 
     @ApiModelProperty(value = "客户sid")
     private String customerSid;
@@ -31,7 +33,8 @@ public class DepositVehicleDetailVo implements Vo {
     @ApiModelProperty(value = "部门名称")
     private String departmentName;
     @ApiModelProperty(value = "销售专员")
-    private String sellerName;
+    @JsonProperty("sellerName")
+    private String staffName;
     @ApiModelProperty(value = "更新状态地址")
     private String updateStateUrl;
     @ApiModelProperty(value = "说明")