From 68c5309001cf6e90a83ca8147d1bae809222222b Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:47:43 +0800
Subject: [PATCH] 导出信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 1 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 2 +-
3 files changed, 3 insertions(+), 2 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 61c681a..717a1f0 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
@@ -104,7 +104,7 @@
private String deviceIndex;
@ApiModelProperty(value = "鍏ュ巶鏃堕棿")
@ExcelColumn(name="鍏ュ巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date eventDate;
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java
index e70f220..2c8ebda 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java
@@ -40,6 +40,6 @@
@ApiModelProperty(value = "杩涘満鏃堕棿")
@ExcelColumn(name="杩涘満鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date eventDate;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 0120b49..a715a63 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -235,6 +235,7 @@
vo.setName(obj.getName());
vo.setPhone(obj.getPhone());
vo.setIdcardNo(obj.getIdcardNo());
+ vo.setDeviceName(obj.getDeviceName());
vo.setEventDate(obj.getEventDate());
retentionVoList.add(vo);
}
--
Gitblit v1.9.3