From af3434a79c2a096105668273cfa27c09eacf6ff1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 09:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 c60aa27..fdac02c 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")
@@ -144,8 +143,10 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
-
private Date callDate;
+
+
+
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍙彿浜虹紪鐮�")
@@ -286,6 +287,17 @@
@ExcelColumn(name="纭浠诲姟鏃堕棿")
private Date confirmTaskDate;
+ @ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
+ @ExcelColumn(name="绛惧埌搴忓彿")
+ private Integer signNum;
+
+ @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 +315,15 @@
@TableField(exist = false)
private String platformName ;
+
+ @ApiModelProperty(value = "浣滀笟閲�" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal workNum ;
+
+
+ @ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
+ @TableField(exist = false)
+ private String ioCreatedate;
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
@@ -356,10 +377,12 @@
private Integer jobType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂磋捣")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateStart;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateEnd;
@@ -380,12 +403,18 @@
@TableField(exist = false)
private BigDecimal workTimes ;
-
+ @ApiModelProperty(value = "甯傚叕鍙歌溅棰勭害璁板綍")
+ @TableField(exist = false)
+ private Integer bookId;
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryStatus;
+ @ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String queryType;
+
@ApiModelProperty(value = "鐢靛瓙閿佺姸鎬侊細0=鏈笂閿� 1=涓嶅垎涓婇攣 2=鍏ㄩ儴涓婇攣")
@TableField(exist = false)
private Integer lockStatus;
--
Gitblit v1.9.3