Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -114,7 +114,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         //获取保养间隔
         int interval = request.getInterval();
         //获取从第几期开始
-        int periods = request.getPeriods();
+        Integer periods = request.getPeriods();
         //获取首保时间
         LocalDate firstTime = request.getFirstTime();
         List<MaintenancePlan> planList = new ArrayList<>();
@@ -160,7 +160,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @description 生成维保计划
      * @date 2020/1/8 8:20 下午
      */
-    public List<MaintenancePlan> generatePlan(MaintenancePlan plan, int periods, int interval, LocalDate beginTime, LocalDate endTime) {
+    public List<MaintenancePlan> generatePlan(MaintenancePlan plan, Integer periods, int interval, LocalDate beginTime, LocalDate endTime) {
         //返回维保计划列表
         List<MaintenancePlan> planList = new ArrayList<>();
         int times = getTimes(interval, beginTime, endTime);
@@ -186,6 +186,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
                 LocalDate planDate = maintenancePlan.getPlanDate().plusDays(interval);
                 entry.setPlanDate(planDate);
             }
+            entry.setCount(periods);
             System.out.printf("i：%s,期数：%s,类型：%s,计划时间：%s,%s", (i + 1), periods, entry.getType(), entry.getPlanDate(), "\n");
             periods++;
             planList.add(entry);