1

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -549,7 +549,7 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                             .andContentTypeNotEqualTo(7).andContractIdEqualTo(contractManage.getId())
                             .andStatusEqualTo(0).andPayTypeEqualTo(1);
                     List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
-                    Optional<Date> max = payLogs.stream().map(PayLog::getPayTime).max(Date::compareTo);
+                    Optional<Date> max = payLogs.stream().map(PayLog::getPayTime).filter(Objects::nonNull).max(Date::compareTo);
                     Date date = max.orElse(null);
                     parkRoomNode = new ParkRoomNode();
                     parkRoomNode.setNodeName("预付款");
@@ -666,10 +666,10 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                     .max(Comparator.comparing(ParkRoomNode::getHandleDate));
             ParkRoomNode parkRoomNode = max.orElse(null);
             if (parkRoomNode != null) {
-                endDate = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm", parkRoomNode.getHandleDate());
+                endDate = DateUtils.parseDateToStr("yyyy-MM-dd", parkRoomNode.getHandleDate());
             }
             Date handleDate = parkRoomNodes.get(0).getHandleDate();
-            startDate = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm", handleDate);
+            startDate = DateUtils.parseDateToStr("yyyy-MM-dd", handleDate);
             parkRoomHistory.setStartDate(startDate);
             parkRoomHistory.setEndDate(endDate);
         }