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/YwDeviceRecord.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
index 7bc54e8..9cacb9e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.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,63 +26,87 @@
@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="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
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 remark;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1鎹熷潖 2鎶ュ簾", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1鎹熷潖 2鎶ュ簾")
+ @ExcelColumn(name="璁惧鐘舵��",index = 3, valueMapping = "0=姝ｅ父;1=鎹熷潖;2=鎶ュ簾;")
private Integer status;
@ApiModelProperty(value = "璁惧鍨嬪彿", example = "1")
- @ExcelColumn(name="璁惧鍨嬪彿")
private Integer modelNo;
@ApiModelProperty(value = "璁惧绫荤紪鐮侊紙绠＄悊yw_device锛�", example = "1")
- @ExcelColumn(name="璁惧绫荤紪鐮侊紙绠＄悊yw_device锛�")
private Integer deviceId;
@ApiModelProperty(value = "杩愮淮浜哄憳缂栫爜缂栫爜(鍏宠仈system_user)", example = "1")
- @ExcelColumn(name="杩愮淮浜哄憳缂栫爜缂栫爜(鍏宠仈system_user)")
private Integer userId;
@ApiModelProperty(value = "渚涘簲鍟�")
- @ExcelColumn(name="渚涘簲鍟�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date company;
@ApiModelProperty(value = "鎯呭喌璇存槑")
- @ExcelColumn(name="鎯呭喌璇存槑")
+ @ExcelColumn(name="杩愮淮澶囨敞",index = 4)
private String content;
@ApiModelProperty(value = "杩愮淮鏃堕棿")
- @ExcelColumn(name="杩愮淮鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dealDate;
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @ExcelColumn(name="璁惧鍚嶇О",index = 2)
+ @TableField(exist = false)
+ private String deviceName;
+
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ @ExcelColumn(name="璁惧缂栧彿",index = 1)
+ @TableField(exist = false)
+ private String deviceCode;
+
+ @ApiModelProperty(value = "杩愮淮浜哄悕绉�")
+ @ExcelColumn(name="杩愮淮浜�",index = 0)
+ @TableField(exist = false)
+ private String realName;
+
+ @ApiModelProperty(value = "杩愮淮浜虹粍缁囧悕绉�")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "杩愮淮浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String mobile;
+
+ @ApiModelProperty(value = "寮�濮嬫棩鏈� yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃ユ湡 yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date endDate;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
}
--
Gitblit v1.9.3