From bf79a36667124868583fcbf47af0e709e088b5e9 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 12 十月 2024 09:09:32 +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 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 846bc80..2424691 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 @@ -318,6 +318,9 @@ @TableField(exist = false) private String platformName ; + @ApiModelProperty(value = "鏄惁瓒呮椂锛�0=鏄紱1=鍚�", example = "1") + @TableField(exist = false) + private Integer isTimeOut; @ApiModelProperty(value = "浣滀笟閲�" ,hidden = true) @TableField(exist = false) @@ -414,6 +417,12 @@ @TableField(exist = false) private String queryStatus; + + @ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊") + @TableField(exist = false) + private String queryStatusForPower; + + @ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊") @TableField(exist = false) private String queryType; @@ -422,6 +431,11 @@ @TableField(exist = false) private Integer lockStatus; + @ApiModelProperty(value = "绛夊緟鍙彿鏃堕棿(鍒嗭級") + @TableField(exist = false) + private Integer worktimeOutAlarmTime; + + public void dealTime(){ if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()) || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) -- Gitblit v1.9.3