فهرست منبع

第三方接口开发

yurk 2 سال پیش
والد
کامیت
25c5ae57d7

+ 12 - 6
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4005,12 +4005,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 java.sql.Date sqlCreateDate= (java.sql.Date) map.get("createDate");
                 java.sql.Timestamp sqlProjectAuditTime= (Timestamp) map.get("projectAuditTime");
                 java.sql.Timestamp sqlTime= (Timestamp) map.get("time");
-                LocalDate createDate = sqlCreateDate.toLocalDate();
-                LocalDateTime projectAuditTime = sqlProjectAuditTime.toLocalDateTime();
-                LocalDateTime time = sqlTime.toLocalDateTime();
-                map.put("createDate",df.format(createDate));
-                map.put("projectAuditTime",projectAuditTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                map.put("time",time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                if(sqlCreateDate!=null){
+                    LocalDate createDate = sqlCreateDate.toLocalDate();
+                    map.put("createDate",df.format(createDate));
+                }
+                if(sqlProjectAuditTime!=null){
+                    LocalDateTime projectAuditTime = sqlProjectAuditTime.toLocalDateTime();
+                    map.put("projectAuditTime",projectAuditTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                }
+                if(sqlTime!=null){
+                    LocalDateTime time = sqlTime.toLocalDateTime();
+                    map.put("time",time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                }
                 List<ReportLog> item=new ArrayList<>();
                 Integer reportId = (Integer) map.get("id");
                 for (ReportLog reportLog : reportLogList) {