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/Retention.java | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java index 00540e4..61c681a 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java +++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java @@ -95,8 +95,13 @@ @ApiModelProperty(value = "鐝") @ExcelColumn(name="鐝") - private String classes; - + private Integer classes; + @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О") + @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О") + private String deviceName; + @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜") + @ExcelColumn(name="娴峰悍闂ㄧ缂栫爜") + private String deviceIndex; @ApiModelProperty(value = "鍏ュ巶鏃堕棿") @ExcelColumn(name="鍏ュ巶鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd") @@ -115,13 +120,18 @@ @TableField(exist = false) public String companyName; - @ApiModelProperty(value = "璁垮鐢ㄦ埛绫诲瀷") - @ExcelColumn(name="璁垮鐢ㄦ埛绫诲瀷") - @TableField(exist = false) - private Integer memberType; - @ApiModelProperty(value = "闂ㄧ鍚嶇О") - @ExcelColumn(name="闂ㄧ鍚嶇О") + // 鏉′欢鏌ヨ鍙傛暟 + @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�") @TableField(exist = false) - private String srcName; + private String keyWords; + + @ApiModelProperty(value = "寮�濮嬫椂闂�") + @TableField(exist = false) + private Date startTime; + + @ApiModelProperty(value = "缁撴潫鏃堕棿") + @TableField(exist = false) + private Date endTime; + } -- Gitblit v1.9.3