From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 126 ++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 34 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..f2c95f8 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;
/**
* 杩愮淮宸ュ崟淇℃伅琛�
@@ -23,125 +26,180 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鏍囬")
- @ExcelColumn(name="鏍囬")
private String title;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鎯呭喌璇存槑")
- @ExcelColumn(name="鎯呭喌璇存槑")
private String content;
@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")
- @ExcelColumn(name="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)")
private Integer projectId;
@ApiModelProperty(value = "鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)", example = "1")
- @ExcelColumn(name="鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)")
private Integer buildingId;
@ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1")
- @ExcelColumn(name="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)")
private Integer roomId;
+ @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1")
+ private Integer floorId;
+
@ApiModelProperty(value = "鎻愭姤浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鎻愭姤浜虹紪鐮�")
private Integer userId;
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
- @ExcelColumn(name="鑱旂郴鐢佃瘽")
private String phone;
@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")
- @ExcelColumn(name="宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�")
private Integer cateId;
@ApiModelProperty(value = "淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙", example = "1")
- @ExcelColumn(name="淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙")
+ @ExcelColumn(name="浣嶇疆鍖哄煙",valueMapping = "0=瀹ゅ唴缁翠慨;1=鍏叡鍖哄煙;",index = 0,width = 10)
private Integer areaType;
@ApiModelProperty(value = "宸ュ崟缂栧彿")
- @ExcelColumn(name="宸ュ崟缂栧彿")
private String code;
@ApiModelProperty(value = "澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�", example = "1")
- @ExcelColumn(name="澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�")
+ @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呮寚娲�;1=宸叉寚娲�;2=宸插鐞�;")
private Integer dealStatus;
@ApiModelProperty(value = "鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)", example = "1")
- @ExcelColumn(name="鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)")
private Integer dispatchUserId;
@ApiModelProperty(value = "鍒嗘淳鏃堕棿")
- @ExcelColumn(name="鍒嗘淳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dispatchDate;
@ApiModelProperty(value = "鍒嗘淳澶勭悊璇存槑")
- @ExcelColumn(name="鍒嗘淳澶勭悊璇存槑")
private String dispatchInfo;
@ApiModelProperty(value = "澶勭悊浜虹紪鐮�(鍏宠仈system_user)", example = "1")
- @ExcelColumn(name="澶勭悊浜虹紪鐮�(鍏宠仈system_user)")
private Integer dealUserId;
@ApiModelProperty(value = "澶勭悊鏃堕棿")
- @ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDate;
@ApiModelProperty(value = "澶勭悊澶囨敞")
- @ExcelColumn(name="澶勭悊澶囨敞")
private String dealInfo;
@ApiModelProperty(value = "澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲", example = "1")
- @ExcelColumn(name="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲")
private Integer dealType;
+
+ @ApiModelProperty(value = "鏉ユ簮 0鑷缓 1闂杞伐鍗�", example = "1")
+ private Integer origin;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @TableField(exist = false)
+ private String projectName;
+
+ @ApiModelProperty(value = "浠诲姟鐘舵�侊細澶氫釜浠�,鍒嗗壊 0寰呭鐞� 1宸插垎娲� 2宸插鐞�")
+ @TableField(exist = false)
+ private String queryStatus;
+
+ @ApiModelProperty(value = "妤煎畤鍚嶇О")
+ @ExcelColumn(name="妤煎畤",index = 1,width = 10)
+ @TableField(exist = false)
+ private String buildingName;
+ @ApiModelProperty(value = "鎴挎簮鍚嶇О")
+ @TableField(exist = false)
+ private String roomName;
+ @ApiModelProperty(value = "闂涓婚敭")
+ @TableField(exist = false)
+ private String problemId;
+ @ApiModelProperty(value = "鎶ヤ慨鍖哄煙")
+ @ExcelColumn(name="鎶ヤ慨鍖哄煙",index = 2,width = 10)
+ @TableField(exist = false)
+ private String areaNameInfo;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
+ @ApiModelProperty(value = "鎴垮彿")
+ @TableField(exist = false)
+ private String roomNum;
+ @ApiModelProperty(value = "鎻愭姤浜哄鍚�")
+ @ExcelColumn(name="涓婃姤浜�",index = 4,width = 10)
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "鎻愭姤浜虹數璇�")
+ @TableField(exist = false)
+ private String creatorMobile;
+ @ApiModelProperty(value = "澶勭悊浜哄鍚�")
+ @TableField(exist = false)
+ @ExcelColumn(name="澶勭悊浜�",index = 6,width = 10)
+ private String dealUserName;
+ @ApiModelProperty(value = "澶勭悊浜虹粍缁�")
+ @TableField(exist = false)
+ private String dealUserCompany;
+ @ApiModelProperty(value = "绫诲埆鍚嶇О")
+ @ExcelColumn(name="宸ュ崟鍒嗙被",index = 3,width = 10)
+ @TableField(exist = false)
+ private String categoryName;
+ @ApiModelProperty(value = "宸ュ崟鐖剁骇鍒嗙被")
+ @TableField(exist = false)
+ private String categoryParentName;
+ @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