黄远 преди 5 години
родител
ревизия
29cbf85973
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

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

@@ -139,7 +139,7 @@ public class LiftDataService {
             //获取维保记录
             List<MtRecordDataModel> mtRecordDataModelList = commonDataMapper.getMtRecordData(liftDataRequest);
             //将维保记录数据转化为 liftId(电梯id) -> status(维保记录状态)
-            final Map<Long, Integer> liftIdToMaintenanceRecordStatus = getLiftIdToMaintenanceRecordStatus(
+            final Map<Long, String> liftIdToMaintenanceRecordStatus = getLiftIdToMaintenanceRecordStatus(
                     mtRecordDataModelList);
             //获取急修记录
             List<EmergencyRecordDataModel> emergencyRecordDataModelList =
@@ -160,7 +160,7 @@ public class LiftDataService {
      */
     private void setLiftMapStatus(List<LiftMapDataModel> liftMapDataModelList,
                                   Map<Long, Integer> liftIdToMaintenancePlanStatus,
-                                  Map<Long, Integer> liftIdToMaintenanceRecordStatus,
+                                  Map<Long, String> liftIdToMaintenanceRecordStatus,
                                   Map<Long, Integer> liftIdToEmergencyStatus) {
         //循环设置电梯状态
         liftMapDataModelList.forEach(liftMapDataModel -> {
@@ -242,7 +242,7 @@ public class LiftDataService {
      * @description 获取电梯id->电梯维保记录状态
      * @date 2020/2/18 2:05 下午
      */
-    private Map<Long, Integer> getLiftIdToMaintenanceRecordStatus(List<MtRecordDataModel> mtRecordDataModels) {
+    private Map<Long, String> getLiftIdToMaintenanceRecordStatus(List<MtRecordDataModel> mtRecordDataModels) {
         if (mtRecordDataModels != null && mtRecordDataModels.size() > 0) {
             return mtRecordDataModels.stream()
                     .collect(Collectors.toMap(MtRecordDataModel::getLiftId, MtRecordDataModel::getStatus));