From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
index 667da1b..48262b0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
@@ -1,15 +1,21 @@
package com.ruoyi.admin.large.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -27,41 +33,50 @@
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @Excel(name = "订单渠道")
@ApiModelProperty(value = "订单渠道")
@TableField("order_channel")
private String orderChannel;
+ @Excel(name = "订单编号")
@ApiModelProperty(value = "订单编号")
@TableField("order_num")
private String orderNum;
+ @Excel(name = "城市")
@ApiModelProperty(value = "城市")
@TableField("city")
private String city;
+ @Excel(name = "品类")
@ApiModelProperty(value = "品类")
@TableField("order_category")
private String orderCategory;
+ @Excel(name = "用户姓名")
@ApiModelProperty(value = "用户姓名")
@TableField("user_name")
private String userName;
- @ApiModelProperty(value = "用户手机号")
+ @Excel(name = "电话")
+ @ApiModelProperty(value = "电话")
@TableField("user_phone")
private String userPhone;
+ @Excel(name = "回收员")
@ApiModelProperty(value = "回收员")
@TableField("recycle_person")
private String recyclePerson;
@ApiModelProperty(value = "日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("order_date")
- private LocalDateTime orderDate;
+ private Date orderDate;
+ @Excel(name = "状态 0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派；6:待改派；7:待预约")
@ApiModelProperty(value = "状态")
@TableField("state")
private Integer state;
@@ -70,5 +85,8 @@
@TableField("import_time")
private LocalDateTime importTime;
+ @Excel(name = "日期(yyyy-MM-dd)")
+ @TableField(exist = false)
+ private String orderDateStr;
}
--
Gitblit v1.7.1