From fbfb89873a326fd5429a2f21f61e659ab80dc03d Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 03 十二月 2024 19:04:48 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 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 b9a4048..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
@@ -1,7 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +12,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 杩愮淮宸ュ崟淇℃伅琛�
@@ -32,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")
@@ -70,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")
@@ -84,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="鎻愭姤浜虹紪鐮�")
@@ -95,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")
@@ -120,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 = "鍒嗘淳澶勭悊璇存槑")
@@ -133,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 = "澶勭悊澶囨敞")
@@ -143,5 +149,64 @@
@ApiModelProperty(value = "澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲", example = "1")
@ExcelColumn(name="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲")
private Integer dealType;
+ @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;
+ @ApiModelProperty(value = "鎻愭姤缁勭粐")
+ @TableField(exist = false)
+ private String creatorCompany;
+ @ApiModelProperty(value = "鎻愭姤浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String creatorPhone;
+ @ApiModelProperty(value = "闂鍥剧墖闆嗗悎")
+ @TableField(exist = false)
+ private List<Multifile> fileList;
+ @ApiModelProperty(value = "澶勭悊鍥剧墖闆嗗悎")
+ @TableField(exist = false)
+ private List<Multifile> dealFileList;
+ @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