From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
index a2a2196..e0c3601 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -73,7 +73,7 @@
@ApiModelProperty(value = "涓婇棬鏃堕棿")
@ExcelColumn(name="涓婇棬鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date getDate;
@ApiModelProperty(value = "鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)", example = "1")
@@ -87,6 +87,9 @@
@ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1")
@ExcelColumn(name="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)")
private Integer roomId;
+ @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1")
+ @ExcelColumn(name="鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)")
+ private Integer floorId;
@ApiModelProperty(value = "鎻愭姤浜虹紪鐮�", example = "1")
@ExcelColumn(name="鎻愭姤浜虹紪鐮�")
@@ -98,7 +101,7 @@
@ApiModelProperty(value = "鎻愭姤鏃堕棿")
@ExcelColumn(name="鎻愭姤鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date submitDate;
@ApiModelProperty(value = "宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�", example = "1")
@@ -123,7 +126,7 @@
@ApiModelProperty(value = "鍒嗘淳鏃堕棿")
@ExcelColumn(name="鍒嗘淳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dispatchDate;
@ApiModelProperty(value = "鍒嗘淳澶勭悊璇存槑")
@@ -136,7 +139,7 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDate;
@ApiModelProperty(value = "澶勭悊澶囨敞")
@@ -149,21 +152,38 @@
@ApiModelProperty(value = "椤圭洰鍚嶇О")
@TableField(exist = false)
private String projectName;
+
+ @ApiModelProperty(value = "浠诲姟鐘舵�侊細澶氫釜浠�,鍒嗗壊 0寰呭鐞� 1宸插垎娲� 2宸插鐞�")
+ @TableField(exist = false)
+ private String queryStatus;
+
@ApiModelProperty(value = "妤煎畤鍚嶇О")
@TableField(exist = false)
private String buildingName;
@ApiModelProperty(value = "鎴挎簮鍚嶇О")
@TableField(exist = false)
private String roomName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
@ApiModelProperty(value = "鎴垮彿")
@TableField(exist = false)
private String roomNum;
@ApiModelProperty(value = "鎻愭姤浜哄鍚�")
@TableField(exist = false)
private String creatorName;
+ @ApiModelProperty(value = "鎻愭姤浜虹數璇�")
+ @TableField(exist = false)
+ private String creatorMobile;
@ApiModelProperty(value = "澶勭悊浜哄鍚�")
@TableField(exist = false)
private String dealUserName;
+ @ApiModelProperty(value = "澶勭悊浜虹粍缁�")
+ @TableField(exist = false)
+ private String dealUserCompany;
+ @ApiModelProperty(value = "绫诲埆鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
@ApiModelProperty(value = "鍒嗛厤浜哄鍚�")
@TableField(exist = false)
private String dispatchUserName;
@@ -182,4 +202,11 @@
@ApiModelProperty(value = "鎿嶄綔璁板綍鍒楄〃")
@TableField(exist = false)
private List<YwWorkorderLog> logList;
+ @ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
}
--
Gitblit v1.9.3