|
@@ -143,6 +143,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
|
|
|
//根据项目id和公司id查询电梯列表
|
|
|
List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
|
|
|
Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getRelevanceId).collect(Collectors.toList());
|
|
|
+ if (CollUtil.isEmpty(list)) return new ArrayList<>();
|
|
|
return baseMapper.selectBatchIds(list);
|
|
|
}
|
|
|
|
|
@@ -172,11 +173,13 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
|
|
|
project.setEndDate(request.getEndDate());
|
|
|
project.setProjectStatus(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
|
|
|
projectService.modify(project);
|
|
|
- //电梯状态设置为正常
|
|
|
- resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode()));
|
|
|
- boolean result = updateBatchById(resultList);
|
|
|
- if (!result) {
|
|
|
- return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
|
|
|
+ if (CollUtil.isNotEmpty(resultList)) {
|
|
|
+ //电梯状态设置为正常
|
|
|
+ resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode()));
|
|
|
+ boolean result = updateBatchById(resultList);
|
|
|
+ if (!result) {
|
|
|
+ return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
//停止服务
|
|
@@ -188,16 +191,17 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
|
|
|
project.setEndRemarks(request.getEndRemarks());
|
|
|
project.setStopTime(request.getStopTime());
|
|
|
projectService.modify(project);
|
|
|
+ if (CollUtil.isNotEmpty(resultList)) {
|
|
|
+ //批量停保项目下的电梯
|
|
|
+ resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
|
|
|
+ updateBatchById(resultList);
|
|
|
|
|
|
- //批量停保项目下的电梯
|
|
|
- resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
|
|
|
- updateBatchById(resultList);
|
|
|
-
|
|
|
- //根据项目id和公司id查询电梯列表
|
|
|
- List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
|
|
|
- Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
|
|
|
- //批量清除维保计划
|
|
|
- maintenancePlanService.removeMaintenancePlan(mtCompanyId, list);
|
|
|
+ //根据项目id和公司id查询电梯列表
|
|
|
+ List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
|
|
|
+ Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
|
|
|
+ //批量清除维保计划
|
|
|
+ maintenancePlanService.removeMaintenancePlan(mtCompanyId, list);
|
|
|
+ }
|
|
|
break;
|
|
|
//继续服务
|
|
|
case "3":
|