浏览代码

update->获取新增电梯数据时,修改判断语句,改成,公司创建电梯时间小于结束时间和大于开始时间

wanghaicheng 4 年之前
父节点
当前提交
12939d7b51

+ 1 - 1
lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/LiftDataService.java

@@ -299,7 +299,7 @@ public class LiftDataService {
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
             return liftDataModelList.stream().filter(liftDataModel -> {
             return liftDataModelList.stream().filter(liftDataModel -> {
                 if (liftDataModel.getConnectTime() != null) {
                 if (liftDataModel.getConnectTime() != null) {
-                    return liftDataModel.getConnectTime().isAfter(liftDataRequest.getStartTimeDate()) ||
+                    return liftDataModel.getConnectTime().isAfter(liftDataRequest.getStartTimeDate()) &&
                             liftDataModel.getConnectTime().isBefore(liftDataRequest.getEndTimeDate());
                             liftDataModel.getConnectTime().isBefore(liftDataRequest.getEndTimeDate());
                 }
                 }
                 return false;
                 return false;