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/YwDevice.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java
index c5da317..2d95c9c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.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;
/**
* 杩愮淮璁惧淇℃伅琛�
@@ -66,7 +69,7 @@
@ApiModelProperty(value = "璁惧鍨嬪彿", example = "1")
@ExcelColumn(name="璁惧鍨嬪彿")
- private Integer modelNo;
+ private String modelNo;
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�", example = "1")
@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�")
@@ -78,8 +81,7 @@
@ApiModelProperty(value = "渚涘簲鍟�")
@ExcelColumn(name="渚涘簲鍟�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date company;
+ private String supplier;
@ApiModelProperty(value = "杩愮淮鍐呭")
@ExcelColumn(name="杩愮淮鍐呭")
@@ -93,4 +95,87 @@
@ExcelColumn(name="鎵�鍦ㄤ綅缃�")
private String addr;
+ @ApiModelProperty(value = "鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)", example = "1")
+ private Integer projectId;
+
+ @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1")
+ private Integer floorId;
+
+ @ApiModelProperty(value = "鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)", example = "1")
+ private Integer buildingId;
+
+ @ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1")
+ private Integer roomId;
+
+
+ @ApiModelProperty(value = "渚涘簲鍟嗚仈绯讳汉")
+ private String supplierLinker;
+
+ @ApiModelProperty(value = "渚涘簲鍟嗚仈绯荤數璇�")
+ private String supplierPhone;
+
+ @ApiModelProperty(value = "缁翠繚浜哄憳涓婚敭锛堝叧鑱攕ystem_user锛�")
+ private Integer maintenanceUserId;
+
+ @ApiModelProperty(value = "缁翠繚鍒版湡鏃�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceOverDate;
+
+ @ApiModelProperty(value = "缁翠繚璇存槑")
+ private String maintenanceContent;
+
+ @ApiModelProperty(value = "璐叆鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date buyDate;
+
+ @ApiModelProperty(value = "鍒嗙被鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "鐖剁骇鍒嗙被鍚嶇О")
+ @TableField(exist = false)
+ private String categoryParentName;
+
+ @ApiModelProperty(value = "鎵�灞炵埗绾у垎绫荤紪鐮侊紙鍏宠仈category锛�", example = "1")
+ @TableField(exist = false)
+ private Integer cateParentId;
+
+ @ApiModelProperty(value = "绠＄悊鍛樺悕绉�")
+ @TableField(exist = false)
+ private String realName;
+
+ @ApiModelProperty(value = "缁翠繚浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String maintenanceUserName;
+
+ @ApiModelProperty(value = "鍥剧墖鍦板潃")
+ @TableField(exist = false)
+ private String fileUrl;
+
+ @ApiModelProperty(value = "鍥剧墖鍦板潃鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String fileFullUrl;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "妤煎畤鍚嶇О")
+ @TableField(exist = false)
+ private String buildingName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
+ @ApiModelProperty(value = "鎴块棿鍚嶇О")
+ @TableField(exist = false)
+ private String roomName;
+
+
+// @ApiModelProperty(value = "闄勪欢淇℃伅")
+// @TableField(exist = false)
+// private Multifile multifile;
}
--
Gitblit v1.9.3