From cdf974d19bab00ac22fe2896eb34b920d58d74a6 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 09 一月 2025 18:30:40 +0800 Subject: [PATCH] 客户资料 巡检任务业务 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 4 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 cff24ae..ef14ea2 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 @@ -12,6 +12,7 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; /** * 杩愮淮璁惧淇℃伅琛� @@ -68,7 +69,7 @@ @ApiModelProperty(value = "璁惧鍨嬪彿", example = "1") @ExcelColumn(name="璁惧鍨嬪彿") - private Integer modelNo; + private String modelNo; @ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙绠$悊category锛�", example = "1") @ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙绠$悊category锛�") @@ -80,8 +81,7 @@ @ApiModelProperty(value = "渚涘簲鍟�") @ExcelColumn(name="渚涘簲鍟�") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date company; + private String supplier; @ApiModelProperty(value = "杩愮淮鍐呭") @ExcelColumn(name="杩愮淮鍐呭") @@ -95,15 +95,67 @@ @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 = "鍒嗙被鍚嶇О") @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 fileUrl; + + @ApiModelProperty(value = "鍥剧墖鍦板潃鍏ㄨ矾寰�") + @TableField(exist = false) + private String fileFullUrl; + @ApiModelProperty(value = "闄勪欢淇℃伅") @TableField(exist = false) - private Multifile multifile; + private List<Multifile> multifileList; + + + + +// @ApiModelProperty(value = "闄勪欢淇℃伅") +// @TableField(exist = false) +// private Multifile multifile; } -- Gitblit v1.9.3