From 14f37814a441d795ae7a15dfe4b7be05aa49f96f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 23 一月 2025 16:30:28 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 b62d1ba..8e07e9c 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
@@ -346,6 +346,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateStart;
+ @ApiModelProperty(value = "寮�濮嬫椂闂磋捣")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date createDateStart;
+ @ApiModelProperty(value = "寮�濮嬫椂闂存")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDateEnd;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -362,14 +370,6 @@
@TableField(exist = false)
private Date beginDoneDateEnd;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
- @TableField(exist = false)
- private Date createDateStart;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿姝�")
- @TableField(exist = false)
- private Date createDateEnd;
@ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
@TableField(exist = false)
@@ -415,18 +415,21 @@
public void dealTime(){
if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
- || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
- ){
+ || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) ){
return;
}
if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
- this.setOptTime(this.getSignDate().getTime());
+ if(this.getSignDate()!=null)
+ this.setOptTime(this.getSignDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
- this.setOptTime(this.getInwaitDate().getTime());
+ if(this.getInwaitDate()!=null)
+ this.setOptTime(this.getInwaitDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
- this.setOptTime(this.getCallDate().getTime());
+ if(this.getCallDate()!=null)
+ this.setOptTime(this.getCallDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
- this.setOptTime(this.getStartDate().getTime());
+ if(this.getStartDate()!=null)
+ this.setOptTime(this.getStartDate().getTime());
}
}
--
Gitblit v1.9.3