From dca4aae965647cf8411931ed44d7cdfff92e386f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 九月 2024 17:59:41 +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 | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 8125540..0871a62 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
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -95,8 +94,8 @@
@ExcelColumn(name="绛惧埌鏃堕棿")
private Date signDate;
- @ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1")
- @ExcelColumn(name="绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌")
+ @ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌 2鍚庡彴绛惧埌", example = "1")
+ @ExcelColumn(name="绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌 2鍚庡彴绛惧埌")
private Integer singType;
@ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴鏃堕棿")
@ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴鏃堕棿")
@@ -144,8 +143,10 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
-
private Date callDate;
+
+
+
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍙彿浜虹紪鐮�")
@@ -286,6 +287,13 @@
@ExcelColumn(name="纭浠诲姟鏃堕棿")
private Date confirmTaskDate;
+ @ApiModelProperty(value = "鏈�鏂板彨鍙锋椂闂�")
+ @TableField(exist = false)
+ private Date newCallDate;
+
+ @ApiModelProperty(value = "鏈�鏂板紑濮嬩綔涓氭椂闂�")
+ @TableField(exist = false)
+ private Date newStartDate;
@ApiModelProperty(value = "鍓嶆柟鎺掗槦鏁伴噺", example = "1")
@TableField(exist = false)
@@ -303,6 +311,9 @@
@TableField(exist = false)
private String platformName ;
+ @ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
+ @TableField(exist = false)
+ private String ioCreatedate;
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
@@ -355,14 +366,35 @@
@TableField(exist = false)
private Integer jobType;
- @ApiModelProperty(value = "寮�濮嬩换鍔℃椂闂磋捣")
+ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂磋捣")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateStart;
- @ApiModelProperty(value = "寮�濮嬩换鍔℃椂闂存")
+ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateEnd;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date createDateStart;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date createDateEnd;
+
+ @ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
+ @TableField(exist = false)
+ private String platformGroupName ;
+
+ @ApiModelProperty(value = "鏈堝彴宸ヤ綔鏃堕暱" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal workTimes ;
+
+
+
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryStatus;
--
Gitblit v1.9.3