修改年检计划时间

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/AnnualInspectionDataModel.java

@@ -2,8 +2,9 @@ package cn.com.ty.lift.batch.applet.dao.model;
 
 import cn.com.ty.lift.batch.applet.constants.DataStatisticsConstants;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -16,7 +17,7 @@ public class AnnualInspectionDataModel extends BaseDataModel {
     /**
      * 计划年检时间
      */
-    private LocalDateTime planDate;
+    private LocalDate planDate;
     /**
      * 年检状态（0 待完成；1 已完成；2 超期）
      */
@@ -52,11 +53,13 @@ public class AnnualInspectionDataModel extends BaseDataModel {
      * @return
      * @description 获取年检计划时间，格式为yyyy-MM-dd
      */
-    public LocalDateTime getPlanDate() {
+    public LocalDate getPlanDate() {
         if (planDate != null) {
             //转换日期格式为yyyy-MM-dd
             String planDateStr = planDate.format(DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
-            return LocalDateTime.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            if (StringUtils.isNotBlank(planDateStr)) {
+                return LocalDate.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            }
         }
         return null;
     }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/AnnualInspectionDataService.java

@@ -65,7 +65,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate());
+                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate().toLocalDate());
                             }
                             return false;
                         })
@@ -76,7 +76,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate());
+                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate().toLocalDate());
                             }
                             return false;
                         })