修改维保计划处理只传间隔的情况

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

@@ -147,7 +147,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         LocalDate firstTime = request.getFirstTime();
         List<MaintenancePlan> planList = new ArrayList<>();
         plans.forEach(plan -> {
-            Optional<Project> project = projects.stream().filter(p -> (p.getId().equals(plan.getProjectId()))).findFirst();
+            Optional<Project> project = projects.stream().filter(p -> p.getId().equals(plan.getProjectId())).findFirst();
             if (project.isPresent()) {
                 Project entry = project.get();
                 planList.addAll(generatePlan(plan, periods, interval, firstTime, entry.getEndDate()));
@@ -192,7 +192,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         //返回维保计划列表
         List<MaintenancePlan> planList = new ArrayList<>();
         int times = getTimes(interval, beginTime, endTime);
-        log.info("总期数{},从第几期开始{},间隔{},开始时间{},结束时间{}", times, periods, interval, beginTime, endTime);
+        log.info("总期数：{},从第{}期开始,保养间隔：{}天,开始时间：{},结束时间：{}", times + 1, periods, interval, beginTime, endTime);
         int length = maintenanceType.length;
         for (int i = 0; i <= times; i++) {
             MaintenancePlan entry = new MaintenancePlan();
@@ -216,7 +216,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
                 entry.setPlanDate(planDate);
             }
             entry.setCount(periods);
-            log.info("每期期数{},类型{},计划时间{}", periods, entry.getType(), entry.getPlanDate());
+            log.info("第{}期,类型：{},计划时间：{}", periods, entry.getType(), entry.getPlanDate());
             periods++;
             planList.add(entry);
         }
@@ -256,24 +256,6 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         return list(lambdaQueryWrapper);
     }
 
-    /**
-     * @param mtCompanyId 公司id
-     * @param liftId 电梯id
-     * @param periods 期数
-     * @return 维保计划
-     * @description 获取当前期数的计划时间
-     * @date 2020/1/9 5:06 下午
-     */
-    public MaintenancePlan detail(Long mtCompanyId, Long liftId, Integer periods){
-        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId, mtCompanyId);
-        lambdaQueryWrapper.eq(MaintenancePlan::getLiftId, liftId);
-        lambdaQueryWrapper.eq(MaintenancePlan::getCount, periods);
-        MaintenancePlan plan = getOne(lambdaQueryWrapper);
-        return plan;
-    }
-
     /**
      * @param request 修改维保计划请求
      * @return 是否修改成功
@@ -284,12 +266,10 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
     public boolean modifyPlan(MaintenanceModifyRequest request) {
         //获取公司id
         Long mtCompanyId = request.getMtCompanyId();
-        //获取公司id
-        Long projectId = request.getProjectId();
-        //获取公司id
+        //获取电梯id
         Long liftId = request.getLiftId();
         MaintenancePlan plan = new MaintenancePlan();
-        plan.setProjectId(projectId);
+        plan.setProjectId(request.getProjectId());
         plan.setMtCompanyId(mtCompanyId);
         plan.setLiftId(liftId);
         plan.setWorkerId(request.getWorkerId());
@@ -321,8 +301,13 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         } else if (isNull && ObjectUtil.isNotEmpty(updateInterval)) {
             //获取当前期数后的维保计划列表，并清除计划
             planList = findPlanList(mtCompanyId, liftId, periods);
-            MaintenancePlan entity = detail(request.getMtCompanyId(), request.getLiftId(), request.getPeriods());
-            LocalDate planDate = entity.getPlanDate();
+            LocalDate planDate;
+            Optional<MaintenancePlan> planOptional = planList.stream()
+                    .filter(entity -> entity.getCount().equals(periods)).findFirst();
+            if (planOptional.isPresent()) {
+                MaintenancePlan maintenancePlan = planOptional.get();
+                planDate = maintenancePlan.getPlanDate();
+            } else return false;
             removeByIds(planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList()));
             //更新项目电梯关联表保养间隔
             projectLiftRelevanceService.modifyPlanInterval(request.getRelevanceId(), updateInterval);

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -88,7 +88,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @description 批量移动电梯
      * @date 2020/1/7 7:57 下午
      */
-    public boolean move(LiftBatchMoveRequest request){
+    public boolean move(LiftBatchMoveRequest request) {
         List<ProjectLiftRelevance> list = request.getList();
         list.forEach(entry -> entry.setProjectId(request.getProjectId()));
         return updateBatchById(list, list.size());
@@ -146,7 +146,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
 
     /**
      * @param mtCompanyId 公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return ProjectLiftRelevance 项目电梯记录
      * @description 根据公司id和电梯id查询项目电梯记录
      * @date 2020/1/8 9:59 上午
@@ -156,13 +156,13 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         LambdaQueryWrapper<ProjectLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(ProjectLiftRelevance::getLiftId, liftId);
-        ProjectLiftRelevance entry=  getOne(lambdaQueryWrapper);
+        ProjectLiftRelevance entry = getOne(lambdaQueryWrapper);
         return ObjectUtil.isNotEmpty(entry) ? entry : null;
     }
 
     /**
      * @param relevanceId 项目电梯关联id
-     * @param interval 保养间隔
+     * @param interval    保养间隔
      * @description 根据项目电梯关联id和保养间隔修改项目电梯关联保养间隔
      * @date 2020/1/8 9:59 上午
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -4,7 +4,6 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.*;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectImportModel;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceGenerateRequest;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;