From 7401116d78140b7e9bdc965bc229bbbcbe01f7a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 四月 2025 11:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index d308374..5de1b32 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.dao.web.dto.DCANoProblemDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -161,6 +162,9 @@
@ApiModelProperty(value = "涓嬫鍌績鏃堕棿")
private Date urgeDate;
+ @ApiModelProperty(value = "鍙鐞哠HE浜哄憳浼佸井涓婚敭")
+ private String sheDealUserQwIds;
+
@ApiModelProperty("闄勪欢淇℃伅")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -203,10 +207,12 @@
@ApiModelProperty(value = "鏄惁鍙浆浜ゆ寜閽細0=鍚︼紱1=鏄紱", example = "0")
@TableField(exist = false)
private Integer passOnButton;
-
@ApiModelProperty(value = "鎴戠殑宸ュ崟:0=鍚︼紱1=鏄紙鏌ヨ浣跨敤锛�", example = "0")
@TableField(exist = false)
private Integer myWorkOrder;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜璺緞", example = "0")
+ @TableField(exist = false)
+ private String typeIdPath;
@ApiModelProperty(value = "鎴戠殑宸ュ崟锛堟煡璇娇鐢級",hidden = true)
@TableField(exist = false)
@@ -215,11 +221,20 @@
@ApiModelProperty(value = "瑙ｅ喅鎯呭喌锛堟煡璇娇鐢級锛�0=鍚︼紱1=鏄紱",hidden = true)
@TableField(exist = false)
private Integer dealStatus;
-
+ @ApiModelProperty(value = "鐘舵�佹弿杩帮紱",hidden = true)
+ @TableField(exist = false)
+ private String statusName;
+ @ApiModelProperty(value = "缁熻鏁帮紱",hidden = true)
+ @TableField(exist = false)
+ private Long num;
@ApiModelProperty("鏂囦欢璺緞鍓嶇紑")
@TableField(exist = false)
private String path;
+ @ApiModelProperty("鏃堕棿閫夐」 0鏈懆 1鏈湀 2鏈搴� 3鏈勾")
+ @TableField(exist = false)
+ private Integer timeType;
+
@ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
@TableField(exist = false)
private List<DCANoProblemDTO> dcaNoProblemDTOList;
@@ -228,4 +243,11 @@
@TableField(exist = false)
private List<Workorder> dcaChildList;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
}
--
Gitblit v1.9.3