From 34f99d106551b51bf2af3bbd40c64624a3af25eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 09:43:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/BusinessTrip.java | 13 ++++++++++++-
1 files changed, 12 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 c77c54f..5ff25c8 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;
/**
@@ -419,7 +422,7 @@
case 1:
return "绛夊緟鎵瑰噯";
case 2:
- return "瀹℃壒閫氳繃";
+ return "鐢宠閫氳繃";
default:
return String.valueOf(this.settle);
}
@@ -499,7 +502,15 @@
}
}
+ public String getBusinessDuration$(){
+ if (null == this.businessDuration) return null;
+ return this.businessDuration+"\t澶�";
+ }
+ public String getBusinessTripDays$(){
+ if (null == this.businessTripDays) return null;
+ return this.businessTripDays+"\t澶�";
+ }
public String getPcdStart() {
StringBuilder sb = new StringBuilder();
--
Gitblit v1.9.1