From d0e9bda3ccb554481bcd52d3c9e22a39ef36abc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 14:44:22 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index b238a22..8f294c0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -39,7 +39,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -48,7 +47,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -65,12 +63,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
@ExcelColumn(name="寮�濮嬫椂闂� yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
@ExcelColumn(name="缁撴潫鏃堕棿 yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -157,7 +153,7 @@
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣鍦板潃")
+ @ExcelColumn(name = "鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
@@ -186,7 +182,6 @@
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
@ExcelColumn(name="鎺ュ崟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
@@ -199,12 +194,10 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
@@ -229,7 +222,6 @@
@ApiModelProperty(value = "璇勪环鏃堕棿")
@ExcelColumn(name="璇勪环鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
@@ -238,7 +230,6 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
@@ -255,7 +246,7 @@
private Integer totalDays;
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
- @ExcelColumn(name="鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
+ @ExcelColumn(name = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
private Integer cancelType;
@ApiModelProperty(value = "鍥剧墖")
@@ -270,11 +261,75 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
-
- @ApiModelProperty(value = "绉诲姩绔敤鎴�",hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
@TableField(exist = false)
private Member member;
+ @ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryMyOrderType;
+
+ @ApiModelProperty(value = "闇�姹傜被鍨�")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "杩愯緭鍝佺")
+ @TableField(exist = false)
+ private String transportTypeName;
+
+ @ApiModelProperty(value = "璺濈 鍗曚綅km")
+ @TableField(exist = false)
+ private double distance;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂瑰悕绉�")
+ @TableField(exist = false)
+ private String acceptName;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂硅仈绯绘柟寮�")
+ @TableField(exist = false)
+ private String acceptPhone;
+
+ @ApiModelProperty(value = "鍙戝崟鏂瑰悕绉�")
+ @TableField(exist = false)
+ private String releaseName;
+
+ @ApiModelProperty(value = "鍙戝崟鏂规墜鏈哄彿")
+ @TableField(exist = false)
+ private String releasePhone;
+
+ @ApiModelProperty(value = "璁㈠崟鍐呭")
+ @TableField(exist = false)
+ private String orderContent;
+
+
+ @ApiModelProperty(value = "鍙戝崟鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date createTimeStart;
+
+ @ApiModelProperty(value = "鍙戝崟鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date createTimeEnd;
+
+
+
+ @ApiModelProperty(value = "鎺ュ崟鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date acceptTimeStart;
+
+ @ApiModelProperty(value = "鎺ュ崟鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date acceptTimeEnd;
+
+
+
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date doneTimeStart;
+
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date doneTimeEnd;
}
+
--
Gitblit v1.9.3