From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 18 十月 2024 14:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index ab179ae..bcfb1f3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -137,7 +137,6 @@
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
-
private Date inwaitDate;
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鎿嶄綔浜虹紪鐮�", example = "1")
@@ -147,8 +146,6 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
private Date callDate;
-
-
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -197,7 +194,6 @@
@ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶鏃堕棿")
-
private Date outDate;
@ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1")
@@ -392,6 +388,16 @@
@TableField(exist = false)
private Date beginWorkDateEnd;
+ @ApiModelProperty(value = "瀹屾垚浣滀笟鏃堕棿璧�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date beginDoneDateStart;
+
+ @ApiModelProperty(value = "瀹屾垚浣滀笟鏃堕棿姝�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date beginDoneDateEnd;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
@TableField(exist = false)
@@ -417,6 +423,12 @@
@TableField(exist = false)
private String queryStatus;
+
+ @ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String queryStatusForPower;
+
+
@ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryType;
--
Gitblit v1.9.3