From 641ad2ace982eece2637c6a79d46094b3cb0d4ea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 24 四月 2025 10:26:25 +0800
Subject: [PATCH] 大屏回收订单
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 248cca8..46bd01a 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,16 +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>
@@ -31,38 +36,47 @@
@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 = "日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@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;
@@ -71,5 +85,8 @@
@TableField("import_time")
private LocalDateTime importTime;
+ @Excel(name = "日期")
+ @TableField(exist = false)
+ private String orderDateStr;
}
--
Gitblit v1.7.1