|
@@ -533,11 +533,11 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- userProfileExportVo.setOneTime(DateUtil.formatDate(new Date(userProfileVo.getOneTime()*1000)));
|
|
|
- userProfileExportVo.setLastTime(DateUtil.formatDate(new Date(userProfileVo.getLastTime()*1000)));
|
|
|
+ userProfileExportVo.setOneTime(DateUtil.formatDateTime(new Date(userProfileVo.getOneTime()*1000)));
|
|
|
+ userProfileExportVo.setLastTime(DateUtil.formatDateTime(new Date(userProfileVo.getLastTime()*1000)));
|
|
|
userProfileExportVo.setCreateByName(userProfileVo.getCreateByName());
|
|
|
if (userProfileVo.getAuditTime() != null) {
|
|
|
- userProfileExportVo.setAuditTime(DateUtil.formatDate(new Date(userProfileVo.getAuditTime() * 1000)));
|
|
|
+ userProfileExportVo.setAuditTime(DateUtil.formatDateTime(new Date(userProfileVo.getAuditTime() * 1000)));
|
|
|
}
|
|
|
userProfileExportVos.add(userProfileExportVo);
|
|
|
}
|
|
@@ -611,11 +611,11 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
|
|
|
userProfileExportVo.setCommitment_electr_signature(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getCommitment_electr_signature().getValue());
|
|
|
}
|
|
|
}
|
|
|
- userProfileExportVo.setOneTime(DateUtil.formatDate(new Date(userProfileVo.getOneTime()*1000)));
|
|
|
- userProfileExportVo.setLastTime(DateUtil.formatDate(new Date(userProfileVo.getLastTime()*1000)));
|
|
|
+ userProfileExportVo.setOneTime(DateUtil.formatDateTime(new Date(userProfileVo.getOneTime()*1000)));
|
|
|
+ userProfileExportVo.setLastTime(DateUtil.formatDateTime(new Date(userProfileVo.getLastTime()*1000)));
|
|
|
userProfileExportVo.setCreateByName(userProfileVo.getCreateByName());
|
|
|
if (userProfileVo.getAuditTime() != null) {
|
|
|
- userProfileExportVo.setAuditTime(DateUtil.formatDate(new Date(userProfileVo.getAuditTime() * 1000)));
|
|
|
+ userProfileExportVo.setAuditTime(DateUtil.formatDateTime(new Date(userProfileVo.getAuditTime() * 1000)));
|
|
|
}
|
|
|
userProfileExportVos.add(userProfileExportVo);
|
|
|
}
|