Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -258,13 +258,13 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
         //若保养时间在计划时间之前，则需要修改维保计划
-        boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
-        if (compareResult) {
+        //boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
+        //if (compareResult) {
             boolean modifyPlan = modifyPlan(request);
             if (!modifyPlan) {
                 return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
             }
-        }
+        //}
         Optional<Lift> lift = liftService.getOne(null, liftId);
         if (lift.isPresent()) {
             Lift l = lift.get();

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

@@ -1,11 +1,11 @@
 package cn.com.ty.lift.business.project.service;
 
 import cn.com.ty.lift.business.capital.dao.mapper.CommonMapper;
+import cn.com.ty.lift.business.framework.BusinessBasicException;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
 import cn.com.ty.lift.business.library.service.LiftService;
-import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
@@ -29,6 +29,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
@@ -304,23 +305,26 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     @Transactional(rollbackFor = Exception.class)
     public RestResponse batchModify(ProjectRequest request) {
         Long newWorkerId = request.getWorkerId();
-        List<ProjectLiftRelevance> list = request.getList();
-        list.forEach(entry -> entry.setWorkerId(request.getWorkerId()));
-        boolean result = updateBatchById(list);
+        //获取项目电梯关联信息
+        List<ProjectLiftRelevance> projectLiftRelevances = request.getList();
+        projectLiftRelevances.forEach(entry -> entry.setWorkerId(request.getWorkerId()));
+        boolean result = this.updateBatchById(projectLiftRelevances);
         if (!result) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        for (ProjectLiftRelevance entry : list) {
+        for (ProjectLiftRelevance entry : projectLiftRelevances) {
             sendMessage(entry.getProjectId(), entry.getMtCompanyId(), entry.getLiftId(), entry.getWorkerId(), newWorkerId);
         }
         //查询未完成的维保任务
-        List<Long> liftIdList = list.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
+        List<Long> liftIdList = projectLiftRelevances.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(liftIdList)) {
             List<MaintenancePlan> planList = maintenancePlanService.getPlanList(request.getMtCompanyId(), liftIdList);
             //修改未完成的维保计划为新的维保负责人
             planList.forEach(entry -> entry.setWorkerId(newWorkerId));
-            boolean planResult = maintenancePlanService.updateBatchById(planList);
-            if (!planResult) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            if (planList.size() > 0) {
+                boolean planResult = maintenancePlanService.updateBatchById(planList);
+                if (!planResult) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+                }
             }
         }
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
@@ -351,9 +355,9 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     }
 
     /**
-     * @param projectId 项目id
+     * @param projectId   项目id
      * @param mtCompanyId 公司id
-     * @param userList 维保工列表
+     * @param userList    维保工列表
      * @return 关联电梯列表
      * @description 根据项目id和公司id，维保工列表查询关联电梯列表
      * @date 2020/6/15 11:19 上午
@@ -410,10 +414,10 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
             return RestResponse.fail("用户存在关联电梯，无法取消");
         }
         boolean removeFlag = projectUserService.remove(new QueryWrapper<ProjectUser>()
-              .eq("project_id", request.getProjectId())
-              .eq("user_id", request.getWorkerId())
+                .eq("project_id", request.getProjectId())
+                .eq("user_id", request.getWorkerId())
         );
-        if(!removeFlag) {
+        if (!removeFlag) {
             return RestResponse.fail("取消关联失败");
         }
         return RestResponse.success(ApiConstants.RESULT_SUCCESS, "操作成功");