Skip to content

C
clx-performance
提交 eabd371b authored 作者: huyufan's avatar huyufan
浏览文件
操作

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

上级 abb61140 46fc2b4e
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 3 行删除
performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java
浏览文件 @ eabd371b
...@@ -244,8 +244,8 @@ public class TransportSyncServiceImpl implements TransportSyncService { ...@@ -244,8 +244,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setLicenceClass(licenceVO.getLicenceClass()); dto.setLicenceClass(licenceVO.getLicenceClass());
dto.setLicenceImg(licenceVO.getLicenceImg()); dto.setLicenceImg(licenceVO.getLicenceImg());
dto.setLicenceBackImg(licenceVO.getLicenceBackImg()); dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get()); dto.setLicenceStartTime(Optional.ofNullable(licenceVO.getLicenceStartTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get() : null);
dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? "2099-12-31 00:00:00" : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get()); dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo()); dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg()); dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get()); dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
...@@ -274,7 +274,7 @@ public class TransportSyncServiceImpl implements TransportSyncService { ...@@ -274,7 +274,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setLicenceImg(licenceVO.getLicenceImg()); dto.setLicenceImg(licenceVO.getLicenceImg());
dto.setLicenceBackImg(licenceVO.getLicenceBackImg()); dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get()); dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? "2099-12-31 00:00:00" : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get()); dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo()); dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg()); dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get()); dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论