feature 代码提交

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationPlanServiceImpl.java

@@ -216,6 +216,7 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
             List<EquLubricationPlanDetailDo> detailList = detailDoList.stream().filter(info -> info.getMasterid().equals(plan.getId()))
                     .filter(info -> checkGenerateData(info, isMonday, isFirstDayOfMonth, currentMonth))
                     .collect(Collectors.toList());
+
             assembleTaskManagementDo(taskList, taskDetailList, plan, detailList, currentMonth, currentYear);
         });
         // 数据存表
@@ -276,6 +277,9 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
                                          List<EquLubricationPlanDetailDo> detailList,
                                          int currentMonth,
                                          int currentYear) {
+        if(taskDetailList.isEmpty()){
+            return;
+        }
         // 获取该计划中次数最大的数据
         Integer maximumFrequency = detailList.stream().map(EquLubricationPlanDetailDo::getNumber).max(Integer::compareTo).get();
         // 任务主表实体