导出信息对接调整提交

lishuai

2023-12-26 68c5309001cf6e90a83ca8147d1bae809222222b

导出信息对接调整提交

 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)")

 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;
}

 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);
            }