订单详情

ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 租车订单对象 zc_order_main
@@ -27,23 +28,32 @@ public class ZcOrderMain extends BaseEntity
     private String orderNo;
 
     /** 订单状态:下单未提车、租赁中、已结束-自动、已结束-手动 */
-    @Excel(name = "订单状态:下单未提车、租赁中、已结束-自动、已结束-手动")
+    @Excel(name = "订单状态",dictType = "key_order_status")
     private String orderStatus;
 
     /** 所属运营商ID */
-    @Excel(name = "所属运营商ID")
     private Long operatorId;
 
+    @Transient
+    @Excel(name = "所属运营商")
+    private String operatorName;
+
+    /** 所属门店名称 */
+    @Transient
+    @Excel(name = "所属门店")
+    private String storeName;
+
     /** 所属门店ID */
-    @Excel(name = "所属门店ID")
     private Long storeId;
 
     /** 车辆ID */
-    @Excel(name = "车辆ID")
+    @Transient
+    @Excel(name = "车辆")
+    private String licensePlate;
+
     private Long vehicleId;
 
     /** 客户id */
-    @Excel(name = "客户id")
     private Long customerId;
 
     /** 客户姓名 */
@@ -55,7 +65,7 @@ public class ZcOrderMain extends BaseEntity
     private String customerPhone;
 
     /** 租赁类型(时租/日租/按天数/以租代售) */
-    @Excel(name = "租赁类型(时租/日租/按天数/以租代售)")
+    @Excel(name = "租赁类型",dictType = "key_order_rental_type")
     private String rentalType;
 
     /** 租赁天数(当类型为"按天数"时使用) */
@@ -105,11 +115,9 @@ public class ZcOrderMain extends BaseEntity
     private Long chargeTimes;
 
     /** 租车套餐id */
-    @Excel(name = "租车套餐id")
     private Long rentCarRuleId;
 
     /** 租电套餐id */
-    @Excel(name = "租电套餐id")
     private Long rentBatteyRuleId;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -345,6 +353,30 @@ public class ZcOrderMain extends BaseEntity
         this.zcOrderSubList = zcOrderSubList;
     }
 
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getLicensePlate() {
+        return licensePlate;
+    }
+
+    public void setLicensePlate(String licensePlate) {
+        this.licensePlate = licensePlate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)