小程序调整

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

@@ -82,7 +82,7 @@ public class EmergencyRepairDataModel extends BaseDataModel{
      * @date 2020/2/5 11:12 上午
      */
     public Long getTakingTimeLength() {
-        return DataStatisticsUtil.getDiffMinute(takingTime, assignTime);
+        return DataStatisticsUtil.getDiffMinute(assignTime, takingTime);
     }
 
     /**
@@ -92,7 +92,7 @@ public class EmergencyRepairDataModel extends BaseDataModel{
      * @date 2020/2/5 11:13 上午
      */
     public Long getArriveTimeLength() {
-        return DataStatisticsUtil.getDiffMinute(arriveTime, takingTime);
+        return DataStatisticsUtil.getDiffMinute(takingTime, arriveTime);
     }
 
     /**
@@ -102,6 +102,6 @@ public class EmergencyRepairDataModel extends BaseDataModel{
      * @date 2020/2/5 11:15 上午
      */
     public Long getFixTimeLength() {
-        return DataStatisticsUtil.getDiffMinute(recoveryDate, arriveTime);
+        return DataStatisticsUtil.getDiffMinute(arriveTime, recoveryDate);
     }
 }

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

@@ -51,9 +51,9 @@ public class MaintenanceDataModel extends BaseDataModel {
     private LocalDate createDate;
 
     /**
-     * 保养状态 0:待完成 1:已完成 2:超期
+     * 状态 0：待完成，1：已完成，-1：超期 2 保养中
      */
-    private Integer maintenanceStatus;
+    private Integer status;
 
     /**
      * 超期类型 1:计划超期 2:法规超期

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

@@ -37,33 +37,7 @@ public class AnnualInspectionDataService {
     public List<AnnualInspectionDataModel> getAnnualInspectionDataListFromRedis(
             AnnualInspectionDataRequest annualInspectionDataRequest) {
         //从redis中获取当前公司的年检信息
-        List<AnnualInspectionDataModel> annualInspectionDataModelList =
-                annualInspectionDataMapper.getAnnualInspectionDataList(annualInspectionDataRequest);
-        if (annualInspectionDataModelList != null && annualInspectionDataModelList.size() > 0) {
-            if (annualInspectionDataRequest.getStartTimeDate() != null) {
-                //通过起始时间过滤数据
-                annualInspectionDataModelList = annualInspectionDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate().toLocalDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            if (annualInspectionDataRequest.getEndTimeDate() != null) {
-                //通过终止时间过滤数据
-                annualInspectionDataModelList = annualInspectionDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate().toLocalDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-        }
-        return annualInspectionDataModelList;
+        return annualInspectionDataMapper.getAnnualInspectionDataList(annualInspectionDataRequest);
     }
 
     /**

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

@@ -44,46 +44,22 @@ public class ContractDataService {
             Map<Long, Long> idToContractModel = contractDataModelList.stream().collect(
                     Collectors.groupingBy(ContractDataModel::getId, Collectors.counting()));
             //设置合同状态
-            contractDataModelList.forEach(a -> {
-                if (a.getStatus() != null) {
-                    switch (a.getStatus()) {
+            contractDataModelList.forEach(contractDataModel -> {
+                if (contractDataModel.getStatus() != null) {
+                    switch (contractDataModel.getStatus()) {
                         case 2:
-                            a.setContractType(2);
+                            contractDataModel.setContractType(2);
                         case 3:
                             //合同结束，如果有续签，则合同未丢失，如果没有需求合同丢失
-                            a.setContractType(3);
-                            Long count = idToContractModel.get(a.getId());
+                            contractDataModel.setContractType(3);
+                            Long count = idToContractModel.get(contractDataModel.getId());
                             if (count != null && count > 0) {
-                                a.setContractType(0);
+                                contractDataModel.setContractType(0);
                             }
                     }
                 }
             });
         }
-        if (contractDataModelList != null && contractDataModelList.size() > 0) {
-            //通过起始时间过滤合同信息
-            if (contractDataRequest.getStartTimeDate() != null) {
-                contractDataModelList = contractDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getGivenDate() != null) {
-                                return a.getGivenDate().isAfter(contractDataRequest.getStartDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            //通过终止时间过滤
-            if (contractDataRequest.getEndTimeDate() != null) {
-                contractDataModelList = contractDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getGivenDate() != null) {
-                                return a.getGivenDate().isBefore(contractDataRequest.getEndDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-        }
         return contractDataModelList;
     }
 
@@ -99,21 +75,21 @@ public class ContractDataService {
         List<ContractDataModel> contractDataModelList = getContractDataListFromRedis(contractDataRequest);
         if (contractDataModelList != null && contractDataModelList.size() > 0) {
             //设置新增合同数量
-            contractTypeToNum.put(1, contractDataModelList.stream().count());
+            contractTypeToNum.put(1, (long) contractDataModelList.size());
             //设置计划合同数量
             long planContractNum = contractDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getContractType() != null) {
-                            return a.getContractType() == 2;
+                    .filter(contractDataModel -> {
+                        if (contractDataModel.getContractType() != null) {
+                            return contractDataModel.getContractType() == 2;
                         }
                         return false;
                     }).count();
             contractTypeToNum.put(2, planContractNum);
             //设置丢失合同数量
             long lostContractNum = contractDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getContractType() != null) {
-                            return a.getContractType() == 3;
+                    .filter(contractDataModel -> {
+                        if (contractDataModel.getContractType() != null) {
+                            return contractDataModel.getContractType() == 3;
                         }
                         return false;
                     }).count();
@@ -136,29 +112,29 @@ public class ContractDataService {
             //定义一个临时变量
             final List<LostContractResponse> finalLostContractResponseList = new ArrayList<>();
             contractDataModelList = contractDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getContractType() != null) {
-                            return a.getContractType() == 3;
+                    .filter(contractDataModel -> {
+                        if (contractDataModel.getContractType() != null) {
+                            return contractDataModel.getContractType() == 3;
                         }
                         return false;
                     })
                     .collect(Collectors.toList());
             //循环设置丢失合同信息
-            contractDataModelList.forEach(a -> {
+            contractDataModelList.forEach(contractDataModel -> {
                 LostContractResponse lostContractResponse = new LostContractResponse();
-                lostContractResponse.setContractCode(a.getCode());
-                lostContractResponse.setProjectName(a.getProjectName());
-                lostContractResponse.setStartDate(a.getStarDate());
-                lostContractResponse.setEndDate(a.getEndDate());
+                lostContractResponse.setContractCode(contractDataModel.getCode());
+                lostContractResponse.setProjectName(contractDataModel.getProjectName());
+                lostContractResponse.setStartDate(contractDataModel.getStarDate());
+                lostContractResponse.setEndDate(contractDataModel.getEndDate());
                 //设置应收金额
-                double planMoney = a.getPlanMoney() != null ? a.getPlanMoney().doubleValue() : 0d;
-                double workMoney = a.getWorkMoney() != null ? a.getWorkMoney().doubleValue() : 0d;
+                double planMoney = contractDataModel.getPlanMoney() != null ? contractDataModel.getPlanMoney().doubleValue() : 0d;
+                double workMoney = contractDataModel.getWorkMoney() != null ? contractDataModel.getWorkMoney().doubleValue() : 0d;
                 lostContractResponse.setNotReceiveMoney(planMoney - workMoney);
                 //设置持续时间
                 lostContractResponse.setDuration(0L);
-                if (a.getStarDate() != null && a.getEndDate() != null) {
+                if (contractDataModel.getStarDate() != null && contractDataModel.getEndDate() != null) {
                     lostContractResponse.setDuration(
-                            Duration.between(a.getEndDate(), a.getStarDate()).toDays());
+                            Duration.between(contractDataModel.getEndDate(), contractDataModel.getStarDate()).toDays());
                 }
                 finalLostContractResponseList.add(lostContractResponse);
             });
@@ -182,20 +158,18 @@ public class ContractDataService {
         if (contractDataModelList != null && contractDataModelList.size() > 0) {
             final List<DueToContractResponse> finalDueToContractResponseList = new ArrayList<>();
             //获取在执行中的合同
-            contractDataModelList = contractDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getContractType() != null) {
-                            return a.getContractType() == 2;
-                        }
-                        return true;
-                    })
-                    .collect(Collectors.toList());
-            contractDataModelList.forEach(a -> {
+            contractDataModelList = contractDataModelList.stream().filter(contractDataModel -> {
+                if (contractDataModel.getContractType() != null) {
+                    return contractDataModel.getContractType() == 2;
+                }
+                return true;
+            }).collect(Collectors.toList());
+            contractDataModelList.forEach(contractDataModel -> {
                 DueToContractResponse dueToContractResponse = new DueToContractResponse();
-                dueToContractResponse.setCollectDate(a.getPlanDate());
-                dueToContractResponse.setEndDate(a.getEndDate());
-                dueToContractResponse.setProjectName(a.getProjectName());
-                double needMoney = a.getPlanMoney() != null ? a.getPlanMoney().doubleValue() : 0d;
+                dueToContractResponse.setCollectDate(contractDataModel.getPlanDate());
+                dueToContractResponse.setEndDate(contractDataModel.getEndDate());
+                dueToContractResponse.setProjectName(contractDataModel.getProjectName());
+                double needMoney = contractDataModel.getPlanMoney() != null ? contractDataModel.getPlanMoney().doubleValue() : 0d;
                 dueToContractResponse.setNeedMoney(needMoney);
                 finalDueToContractResponseList.add(dueToContractResponse);
             });

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

@@ -8,9 +8,13 @@ import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.date.DatePattern;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -35,64 +39,44 @@ public class EmergencyRepairDataService {
      */
     public List<EmergencyRepairDataModel> getEmergencyRepairDataListFromRedis(EmergencyRepairDataRequest
                                                                                       emergencyRepairDataRequest) {
+        setEmergencyRepairTime(emergencyRepairDataRequest);
         //从redis获取当前公司的急修信息
         List<EmergencyRepairDataModel> emergencyRepairDataModelList =
                 emergencyRepairDataMapper.getEmergencyRepairDataList(emergencyRepairDataRequest);
         if (emergencyRepairDataModelList != null && emergencyRepairDataModelList.size() > 0) {
-            emergencyRepairDataModelList.forEach(a -> {
+            emergencyRepairDataModelList.forEach(emergencyRepairDataModel -> {
                 //计算接单时长
-                if (a.getAssignTime() != null && a.getTakingTime() != null) {
-                    a.setTakingTimeLength(DataStatisticsUtil.getDiffMinute(a.getTakingTime(), a.getAssignTime()));
+                if (emergencyRepairDataModel.getAssignTime() != null && emergencyRepairDataModel.getTakingTime() != null) {
+                    emergencyRepairDataModel.setTakingTimeLength(DataStatisticsUtil.getDiffMinute(
+                            emergencyRepairDataModel.getAssignTime(), emergencyRepairDataModel.getTakingTime()));
                 }
                 //计算到达时长
-                if (a.getTakingTime() != null && a.getArriveTime() != null) {
-                    a.setArriveTimeLength(DataStatisticsUtil.getDiffMinute(a.getArriveTime(), a.getTakingTime()));
+                if (emergencyRepairDataModel.getTakingTime() != null && emergencyRepairDataModel.getArriveTime() != null) {
+                    emergencyRepairDataModel.setArriveTimeLength(DataStatisticsUtil.getDiffMinute(
+                            emergencyRepairDataModel.getTakingTime(), emergencyRepairDataModel.getArriveTime()));
                 }
                 //计算修理时长
-                if (a.getArriveTime() != null && a.getRecoveryDate() != null) {
-                    a.setFixTimeLength(DataStatisticsUtil.getDiffMinute(a.getRecoveryDate(), a.getTakingTime()));
+                if (emergencyRepairDataModel.getArriveTime() != null && emergencyRepairDataModel.getRecoveryDate() != null) {
+                    emergencyRepairDataModel.setFixTimeLength(DataStatisticsUtil.getDiffMinute(
+                            emergencyRepairDataModel.getTakingTime(), emergencyRepairDataModel.getRecoveryDate()));
                 }
             });
         }
         if (emergencyRepairDataModelList != null && emergencyRepairDataModelList.size() > 0) {
-            //过滤起始时间之前的数据
-            if (emergencyRepairDataRequest.getStartTimeDate() != null) {
-                emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getCallerDate() != null) {
-                                return a.getCallerDate().isAfter(emergencyRepairDataRequest.getStartTimeDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            //过滤终止时间之后的数据
-            if (emergencyRepairDataRequest.getEndTimeDate() != null) {
-                emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getCallerDate() != null) {
-                                return a.getCallerDate().isBefore(emergencyRepairDataRequest.getEndTimeDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
             //通过区域id过滤数据
             if (emergencyRepairDataRequest.getRegionId() != null) {
                 emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
-                        .filter(a -> a.getRegionId().equals(emergencyRepairDataRequest.getRegionId()))
-                        .collect(Collectors.toList());
+                        .filter(emergencyRepairDataModel -> emergencyRepairDataModel.getRegionId().equals(
+                                emergencyRepairDataRequest.getRegionId())).collect(Collectors.toList());
             }
             //通过状态过滤数据
             if (emergencyRepairDataRequest.getStatus() != null) {
-                emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getStatus() != null) {
-                                return a.getStatus() == emergencyRepairDataRequest.getStatus();
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
+                emergencyRepairDataModelList = emergencyRepairDataModelList.stream().filter(emergencyRepairDataModel -> {
+                    if (emergencyRepairDataModel.getStatus() != null) {
+                        return emergencyRepairDataModel.getStatus().equals(emergencyRepairDataRequest.getStatus());
+                    }
+                    return false;
+                }).collect(Collectors.toList());
             }
         }
         return emergencyRepairDataModelList;
@@ -176,7 +160,7 @@ public class EmergencyRepairDataService {
     public RestResponse emergencyStatus(EmergencyRepairDataRequest emergencyRepairDataRequest) {
         List<EmergencyRepairDataModel> emergencyRepairDataModelList =
                 getEmergencyRepairDataListFromRedis(emergencyRepairDataRequest);
-        if(emergencyRepairDataModelList != null && emergencyRepairDataModelList.size() > 0){
+        if (emergencyRepairDataModelList != null && emergencyRepairDataModelList.size() > 0) {
             //通过发起急修时间降序排列,并获取前5条数据
             emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
                     .sorted(Comparator.comparing(EmergencyRepairDataModel::getCallerDate).reversed()).limit(5)
@@ -184,4 +168,21 @@ public class EmergencyRepairDataService {
         }
         return RestResponse.success(emergencyRepairDataModelList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
+
+    /**
+     * @param
+     * @return
+     * @description
+     * @date 2020/5/15 11:06 上午
+     */
+    private void setEmergencyRepairTime(EmergencyRepairDataRequest emergencyRepairDataRequest) {
+        if (StringUtils.isBlank(emergencyRepairDataRequest.getEndTimeDateStr()) ||
+                StringUtils.isBlank(emergencyRepairDataRequest.getEndTimeDateStr())) {
+            //设置时间
+            emergencyRepairDataRequest.setStartTimeDateStr(DataStatisticsUtil.getYearFirstTime()
+                    .format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+            emergencyRepairDataRequest.setEndTimeDateStr(LocalDateTime.now()
+                    .format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+        }
+    }
 }

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

@@ -53,45 +53,6 @@ public class LiftDataService {
         return liftDataModelList;
     }
 
-
-    /**
-     * @param liftDataRequest 起始时间 终止时间
-     * @return
-     * @description
-     * @date 2020/2/4 10:36 上午
-     */
-    public List<LiftDataModel> getLiftDataListFromRedis(LiftDataRequest liftDataRequest) {
-        //从redis中获取当前公司电梯信息
-        List<LiftDataModel> liftDataModelList = getLiftDataModels(liftDataRequest);
-        if (liftDataModelList != null && liftDataModelList.size() > 0) {
-            //过滤起始时间之前的数据
-            if (liftDataRequest.getStartTimeDate() != null) {
-                liftDataModelList = liftDataModelList.stream()
-                        //新增电梯的时间
-                        .filter(a -> {
-                            if (a.getConnectTime() != null) {
-                                return a.getConnectTime().isAfter(liftDataRequest.getStartTimeDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            //过滤终止时间之后的数据
-            if (liftDataRequest.getEndTimeDate() != null) {
-                liftDataModelList = liftDataModelList.stream()
-                        //新增电梯的时间
-                        .filter(a -> {
-                            if (a.getConnectTime() != null) {
-                                return a.getConnectTime().isBefore(liftDataRequest.getEndTimeDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-        }
-        return liftDataModelList;
-    }
-
     /**
      * @param
      * @return
@@ -107,7 +68,7 @@ public class LiftDataService {
         //设置时间段
         DataStatisticsUtil.setBeginYearToNow(liftDataRequest);
         //从redis中获取当前公司时间段之内的电梯信息
-        List<LiftDataModel> liftDataModelList = getLiftDataListFromRedis(liftDataRequest);
+        List<LiftDataModel> liftDataModelList = getLiftDataModels(liftDataRequest);
         if ((companyTotalLiftDataList != null && companyTotalLiftDataList.size() > 0)) {
             //获取传递起始时间之前的电梯信息
             List<LiftDataModel> beforeLiftDataList = companyTotalLiftDataList.stream()
@@ -175,13 +136,18 @@ public class LiftDataService {
         RegionLiftResponseTotal regionLiftResponseTotal = new RegionLiftResponseTotal();
         //区域电梯数据
         List<RegionLiftResponse> regionLiftResponseList = new ArrayList<>();
-        List<LiftDataModel> liftDataModelList = getLiftDataListFromRedis(liftDataRequest);
+        List<LiftDataModel> liftDataModelList = getLiftDataModels(liftDataRequest);
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
             regionLiftResponseTotal.setTotalLiftNum(liftDataModelList.size());
             final List<RegionLiftResponse> finalRegionLiftResponseList = new ArrayList<>();
             //将数据转化为 区域名称->电梯数据列表
             Map<String, List<LiftDataModel>> regionNameToLiftData = liftDataModelList.stream()
-                    .collect(Collectors.groupingBy(LiftDataModel::getRegionName));
+                    .collect(Collectors.groupingBy(liftDataModel -> {
+                        if (liftDataModel.getRegionName() != null) {
+                            return liftDataModel.getRegionName();
+                        }
+                        return "暂无";
+                    }));
             //封装区域电梯信息
             regionNameToLiftData.forEach((key, value) -> {
                 RegionLiftResponse regionLiftResponse = new RegionLiftResponse();
@@ -219,14 +185,19 @@ public class LiftDataService {
     public RestResponse projectLiftNums(LiftDataRequest liftDataRequest) {
         Map<String, Long> projectNameToLiftNums = new HashMap<>();
         //获取时间段内的电梯数量
-        List<LiftDataModel> liftDataModelList = getLiftDataListFromRedis(liftDataRequest);
+        List<LiftDataModel> liftDataModelList = getLiftDataModels(liftDataRequest);
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
             //过滤掉丢失的电梯
             liftDataModelList = liftDataModelList.stream()
                     .filter(a -> a.getLiftStatus() != 3).collect(Collectors.toList());
             //通过项目名称给电梯数据分组
             projectNameToLiftNums = liftDataModelList.stream()
-                    .collect(Collectors.groupingBy(LiftDataModel::getProjectName, Collectors.counting()));
+                    .collect(Collectors.groupingBy(liftDataModel -> {
+                        if (liftDataModel.getProjectName() != null) {
+                            return liftDataModel.getProjectName();
+                        }
+                        return "暂无";
+                    }, Collectors.counting()));
         }
         //通过电梯台量给map排序 通过值降序
         projectNameToLiftNums = DataStatisticsUtil.sortByValue(projectNameToLiftNums, true);

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

@@ -37,33 +37,7 @@ public class MaintenanceDataService {
      */
     public List<MaintenanceDataModel> getMaintenanceDataListFromRedis(MaintenanceDataRequest maintenanceDataRequest) {
         //从redis中获取当前公司维保数据
-        List<MaintenanceDataModel> maintenanceDataModelList = maintenanceDataMapper
-                .getMaintenanceDataList(maintenanceDataRequest);
-        if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
-            //通过起始时间过滤
-            if (maintenanceDataRequest.getStartDate() != null) {
-                maintenanceDataModelList = maintenanceDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(maintenanceDataRequest.getStartDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            //通过终止时间过滤
-            if (maintenanceDataRequest.getEndDate() != null) {
-                maintenanceDataModelList = maintenanceDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isBefore(maintenanceDataRequest.getEndDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-        }
-        return maintenanceDataModelList;
+        return maintenanceDataMapper.getMaintenanceDataList(maintenanceDataRequest);
     }
 
     /**
@@ -79,16 +53,15 @@ public class MaintenanceDataService {
         if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
             //设置计划保养数
             maintenanceOverViewResponse.setPlanNum((long) maintenanceDataModelList.size());
-            //保养状态 0:待完成 1:已完成 2:超期
+            //保养状态 0:待保养 2:保养中 1:已完成 -1:超期
             //设置完成保养数
             long finishNum = maintenanceDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getMaintenanceStatus() != null) {
-                            return a.getMaintenanceStatus() == 1;
+                    .filter(maintenanceDataModel -> {
+                        if (maintenanceDataModel.getStatus() != null) {
+                            return maintenanceDataModel.getStatus() == 1;
                         }
                         return false;
-                    })
-                    .count();
+                    }).count();
             maintenanceOverViewResponse.setFinishNum(finishNum);
             setBeyondNum(maintenanceOverViewResponse, maintenanceDataModelList);
         }
@@ -108,13 +81,12 @@ public class MaintenanceDataService {
         if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
             //获取超期数
             maintenanceDataModelList = maintenanceDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getMaintenanceStatus() != null) {
-                            return a.getMaintenanceStatus() == 2;
+                    .filter(maintenanceDataModel -> {
+                        if (maintenanceDataModel.getStatus()!= null) {
+                            return maintenanceDataModel.getStatus() == -1;
                         }
                         return false;
-                    })
-                    .collect(Collectors.toList());
+                    }).collect(Collectors.toList());
             Map<String, Long> allProjectNameToBeyondNum = maintenanceDataModelList.stream()
                     .collect(Collectors.groupingBy(MaintenanceDataModel::getProjectName, Collectors.counting()));
             //通过超期台量倒序排列
@@ -140,23 +112,21 @@ public class MaintenanceDataService {
                               List<MaintenanceDataModel> maintenanceDataModelList) {
         //设置总超期数
         long totalBeyondNum = maintenanceDataModelList.stream()
-                .filter(a -> {
-                    if (a.getMaintenanceStatus() != null) {
-                        return a.getMaintenanceStatus() == 2;
+                .filter(maintenanceDataModel -> {
+                    if (maintenanceDataModel.getStatus() != null) {
+                        return maintenanceDataModel.getStatus() == -1;
                     }
                     return false;
-                })
-                .count();
+                }).count();
         maintenanceOverViewResponse.setTotalBeyondNum(totalBeyondNum);
         //获取超期的维保记录
         List<MaintenanceDataModel> beyondMaintenanceDataModelList = maintenanceDataModelList.stream()
-                .filter(a -> {
-                    if (a.getMaintenanceStatus() != null) {
-                        return a.getMaintenanceStatus() == 2;
+                .filter(maintenanceDataModel -> {
+                    if (maintenanceDataModel.getStatus() != null) {
+                        return maintenanceDataModel.getStatus() == -1;
                     }
                     return false;
-                })
-                .collect(Collectors.toList());
+                }).collect(Collectors.toList());
         if (beyondMaintenanceDataModelList.size() > 0) {
             //获取当前时间
             LocalDate now = LocalDate.now();
@@ -164,18 +134,17 @@ public class MaintenanceDataService {
             setBeyondType(maintenanceDataModelList, beyondMaintenanceDataModelList, now);
             //设置计划超期数
             long planBeyondNum = beyondMaintenanceDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getBeyondType() != null) {
-                            return a.getBeyondType() == 1;
+                    .filter(maintenanceDataModel -> {
+                        if (maintenanceDataModel.getBeyondType() != null) {
+                            return maintenanceDataModel.getBeyondType() == 1;
                         }
                         return false;
-                    })
-                    .count();
+                    }).count();
             //设置法规超期数
             long lawBeyondNum = beyondMaintenanceDataModelList.stream()
-                    .filter(a -> {
-                        if (a.getBeyondType() != null) {
-                            return a.getBeyondType() == 2;
+                    .filter(maintenanceDataModel -> {
+                        if (maintenanceDataModel.getBeyondType() != null) {
+                            return maintenanceDataModel.getBeyondType() == 2;
                         }
                         return false;
                     })
@@ -208,7 +177,7 @@ public class MaintenanceDataService {
             } else {
                 //获取上次保养记录
                 MaintenanceDataModel lastMaintenanceDataModel = liftMaintenanceDataModelList.stream()
-                        .filter(a -> a.getCount() == beyondMaintenanceDataModel.getCount() - 1)
+                        .filter(maintenanceDataModel -> maintenanceDataModel.getCount() == beyondMaintenanceDataModel.getCount() - 1)
                         .collect(Collectors.toList()).get(0);
                 //获取保养完成时间
                 maintenanceDate = lastMaintenanceDataModel.getFinishDate();

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

@@ -42,38 +42,14 @@ public class PaymentDataService {
         //从redis中获取当前公司的收款数据
         List<PaymentDataModel> paymentDataModelList = paymentDataMapper.getPaymentDataList(paymentDataRequest);
         if (paymentDataModelList != null && paymentDataModelList.size() > 0) {
-            //通过终止时间过滤
-            if (paymentDataRequest.getEndDate() != null) {
-                paymentDataModelList = paymentDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isBefore(paymentDataRequest.getEndDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
-            //通过起始时间过滤
-            if (paymentDataRequest.getStartDate() != null) {
-                paymentDataModelList = paymentDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(paymentDataRequest.getStartDate());
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
-            }
             //通过合同类型过滤
             if (paymentDataRequest.getPaymentType() != null) {
-                paymentDataModelList = paymentDataModelList.stream()
-                        .filter(a -> {
-                            if (a.getPaymentType() != null) {
-                                return a.getPaymentType() == paymentDataRequest.getPaymentType();
-                            }
-                            return false;
-                        })
-                        .collect(Collectors.toList());
+                paymentDataModelList = paymentDataModelList.stream().filter(paymentDataModel -> {
+                    if (paymentDataModel.getPaymentType() != null) {
+                        return paymentDataModel.getPaymentType().equals(paymentDataRequest.getPaymentType());
+                    }
+                    return false;
+                }).collect(Collectors.toList());
             }
         }
         return paymentDataModelList;
@@ -193,8 +169,8 @@ public class PaymentDataService {
                         afterDate = paymentDataModel.getWorkDate();
                     }
                     if (afterDate != null && paymentDataModel.getPlanDate() != null) {
-                        projectPaymentResponse.setDueToDays(Long.valueOf(afterDate.until(
-                                paymentDataModel.getPlanDate()).getDays()));
+                        projectPaymentResponse.setDueToDays((long) afterDate.until(
+                                paymentDataModel.getPlanDate()).getDays());
                     }
                     //合同金额
                     double contractMoney = paymentDataModel.getContractMoney() != null

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

@@ -133,9 +133,9 @@ public class DataStatisticsUtil {
      * @description 请两个时间的分钟差值
      * @date 2020/2/5 10:02 上午
      */
-    public static Long getDiffMinute(LocalDateTime afterTime, LocalDateTime beforeTime) {
+    public static Long getDiffMinute(LocalDateTime beforeTime, LocalDateTime afterTime) {
         if (beforeTime != null && afterTime != null) {
-            Duration duration = Duration.between(afterTime, beforeTime);
+            Duration duration = Duration.between(beforeTime, afterTime);
             return duration.toMinutes();
         }
         return 0L;
@@ -177,7 +177,7 @@ public class DataStatisticsUtil {
             map.entrySet().stream().sorted(Map.Entry.<K, V>comparingByKey().reversed())
                     .forEachOrdered(e -> result.put(e.getKey(), e.getValue()));
         } else {
-            map.entrySet().stream().sorted(Map.Entry.<K, V>comparingByKey())
+            map.entrySet().stream().sorted(Map.Entry.comparingByKey())
                     .forEachOrdered(e -> result.put(e.getKey(), e.getValue()));
         }
         return result;
@@ -196,7 +196,7 @@ public class DataStatisticsUtil {
             map.entrySet().stream().sorted(Map.Entry.<K, V>comparingByValue().reversed())
                     .forEachOrdered(e -> result.put(e.getKey(), e.getValue()));
         } else {
-            map.entrySet().stream().sorted(Map.Entry.<K, V>comparingByValue())
+            map.entrySet().stream().sorted(Map.Entry.comparingByValue())
                     .forEachOrdered(e -> result.put(e.getKey(), e.getValue()));
         }
         return result;

lift-batch-service/src/main/resources/mapper/MaintenanceDataMapper.xml

@@ -13,6 +13,7 @@
             mp.create_date as createDate,
             mp.work_date as finishDate,
             mp.count as count,
+            mp.status as status,
             plr.first_time as firstDate,
             p.project_name as projectName
         from

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -269,8 +269,11 @@ public class LiftDataService {
      */
     private Map<Long, Integer> getLiftIdToEmergencyStatus(List<EmergencyRecordDataModel> emergencyRecordDataModelList) {
         if (emergencyRecordDataModelList != null && emergencyRecordDataModelList.size() > 0) {
-            return emergencyRecordDataModelList.stream()
-                    .collect(Collectors.toMap(EmergencyRecordDataModel::getLiftId, EmergencyRecordDataModel::getStatus));
+            Map<Long, Integer> liftIdToEmergencyStatus = new HashMap<>();
+            emergencyRecordDataModelList.forEach(emergencyRecordDataModel -> {
+                liftIdToEmergencyStatus.put(emergencyRecordDataModel.getLiftId(), emergencyRecordDataModel.getStatus());
+            });
+            return liftIdToEmergencyStatus;
         }
         return new HashMap<>();
     }