From 42ffad01769b4c57c76d3ee9f3a69463889f9813 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 22 十一月 2024 18:20:36 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 c6b72ce..a2a2196 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;
/**
* 杩愮淮宸ュ崟淇℃伅琛�
@@ -77,8 +80,8 @@
@ExcelColumn(name="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)")
private Integer projectId;
- @ApiModelProperty(value = "鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)", example = "1")
- @ExcelColumn(name="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)")
+ @ApiModelProperty(value = "鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)", example = "1")
+ @ExcelColumn(name="鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)")
private Integer buildingId;
@ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1")
@@ -143,5 +146,40 @@
@ApiModelProperty(value = "澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲", example = "1")
@ExcelColumn(name="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲")
private Integer dealType;
-
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "妤煎畤鍚嶇О")
+ @TableField(exist = false)
+ private String buildingName;
+ @ApiModelProperty(value = "鎴挎簮鍚嶇О")
+ @TableField(exist = false)
+ private String roomName;
+ @ApiModelProperty(value = "鎴垮彿")
+ @TableField(exist = false)
+ private String roomNum;
+ @ApiModelProperty(value = "鎻愭姤浜哄鍚�")
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "澶勭悊浜哄鍚�")
+ @TableField(exist = false)
+ private String dealUserName;
+ @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;
}
--
Gitblit v1.9.3