数据统计-合同

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

@@ -8,5 +8,5 @@ import lombok.Data;
  * @description
  */
 @Data
-public class MaintenanceDataModel extends BaseDataModel{
+public class MaintenanceDataModel extends BaseDataModel {
 }

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

@@ -14,11 +14,11 @@ public class ContractDataRequest extends CommonRequest{
     /**
      * 起始时间
      */
-    private LocalDate startTimeDate;
+    private LocalDate startDate;
     /**
      * 结束时间
      */
-    private LocalDate endTimeDate;
+    private LocalDate endDate;
     /**
      * 合同取值范围 top5 表示前5 all 表示全部
      */

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

@@ -82,13 +82,13 @@ public class ContractDataService {
             //通过起始时间过滤合同信息
             if (contractDataRequest.getStartTimeDate() != null) {
                 contractDataModelList = contractDataModelList.stream()
-                        .filter(a -> a.getGivenDate().isAfter(contractDataRequest.getStartTimeDate()))
+                        .filter(a -> a.getGivenDate().isAfter(contractDataRequest.getStartDate()))
                         .collect(Collectors.toList());
             }
             //通过终止时间过滤
             if (contractDataRequest.getEndTimeDate() != null) {
                 contractDataModelList = contractDataModelList.stream()
-                        .filter(a -> a.getGivenDate().isBefore(contractDataRequest.getEndTimeDate()))
+                        .filter(a -> a.getGivenDate().isBefore(contractDataRequest.getEndDate()))
                         .collect(Collectors.toList());
             }
         }