From 09ee5added9d59e90310a2586e846137ea597b19 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 13:15:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/BusinessTrip.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
index 3e7f25a..3d3eac8 100644
--- a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
+++ b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.crm.manager.utils.TimeCalculatorUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
@@ -131,6 +132,7 @@
@ApiModelProperty(value= "鍑哄彂鏃ユ湡")
@TableField("business_start_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date businessStartTime;
/**
@@ -139,6 +141,7 @@
@ApiModelProperty(value= "缁撴潫鏃ユ湡")
@TableField("business_end_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date businessEndTime;
/**
@@ -211,6 +214,13 @@
private Long hostId;
/**
+ * 璺熻釜椤圭洰ID
+ */
+ @ApiModelProperty(value= "璺熻釜椤圭洰ID")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value= "鍒涘缓鏃堕棿")
@@ -275,6 +285,10 @@
@ApiModelProperty(value= "缁撴潫鏃惰景")
@TableField("business_end_time_day")
private Integer businessEndTimeDay;
+
+ @ApiModelProperty(value= "涓氬姟鍛�")
+ @TableField("member_id")
+ private Long memberId;
@TableField(exist = false)
private String pcdStart;
@@ -488,7 +502,7 @@
public String getBusinessEndTimeDay$(){
if (null == this.businessEndTimeDay){ return null; }
- switch (this.businessTransportation){
+ switch (this.businessEndTimeDay){
case 1:
return TimeCalculatorUtils.timeYestMonthDay(this.businessEndTime)+ "涓婂崍";
case 2:
--
Gitblit v1.9.1