From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 222329d..1bcb540 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
/**
* 浜哄憳鍩硅鏈夋晥鏈熻褰�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳鍩硅鏈夋晥鏈熻褰�")
@@ -22,53 +23,77 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private String creator;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date createDate;
+
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private String edirot;
@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 = "浜哄憳缂栫爜", example = "1")
- @ExcelColumn(name="浜哄憳缂栫爜")
private Integer memberId;
@ApiModelProperty(value = "鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="鏈夋晥鏈熷紑濮�")
- private String startTime;
+ private Date startTime;
- @ApiModelProperty(value = "鏈夋晥鏈熺粨鏉�", example = "1")
- @ExcelColumn(name="鏈夋晥鏈熺粨鏉�")
- private Integer endTime;
+
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
- @ExcelColumn(name="瀵煎叆鐘舵��")
private Integer importStatus;
@ApiModelProperty(value = "瀵煎叆澶囨敞")
- @ExcelColumn(name="瀵煎叆澶囨敞")
private String importInfo;
+
+
+ @ApiModelProperty(value = "濮撳悕")
+ @TableField(exist = false)
+ @ExcelColumn(name="濮撳悕", index = 1)
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵嬫満鍙�", index = 2)
+ private String phone;
+
+ @ApiModelProperty(value = "韬唤璇�")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤璇�", index = 3)
+ private String idcardNo;
+
+
+
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炲叕鍙�", index = 4)
+ private String companyName;
+
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎿嶄綔浜�", index = 5)
+ private String createName;
+
+ @ApiModelProperty(value = "鍩硅鏃堕棿鑷�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍩硅鏃堕棿鑷�", index = 6 ,dateFormat="yyyy-MM-dd")
+ private Date endTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鎿嶄綔鏃堕棿", index = 7 ,dateFormat="yyyy-MM-dd")
+ private Date createDate;
+
}
--
Gitblit v1.9.3