Преглед на файлове

修复<批量更新维保负责人,项目中没有新增这个新的维保工>问题

wanghaicheng преди 5 години
родител
ревизия
b5262856ec
променени са 1 файла, в които са добавени 11 реда и са изтрити 7 реда
  1. 11 7
      lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

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

@@ -31,6 +31,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
  * @description 项目电梯关联业务层
  */
 @Service
+@Slf4j
 public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanceMapper, ProjectLiftRelevance> {
 
     @Resource
@@ -318,22 +320,23 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
                 in("project_id", projectIds));
         //创建待插入的项目成员列表
         Set<ProjectUser> insertProjectUsers = new HashSet<>();
-        //循环前端传过来的项目电梯信息
-        request.getList().forEach(projectLiftRelevance -> {
+        //循环前端传过来的项目信息
+        log.info("前端传过来的项目id" + projectIds);
+        projectIds.forEach(projectId -> {
             //查询项目用户关联表中是否有这个关联
             for (ProjectUser projectUser : projectUsers) {
-                boolean existCompanyProject = projectLiftRelevance.getProjectId().equals(projectUser.getProjectId()) &&
-                        projectLiftRelevance.getMtCompanyId().equals(projectUser.getMtCompanyId());
+                boolean existCompanyProject = projectId.equals(projectUser.getProjectId()) &&
+                        request.getMtCompanyId().equals(projectUser.getMtCompanyId());
                 //如果用户在公司项目下且有关联,就终止循环
-                if (existCompanyProject && projectLiftRelevance.getWorkerId().equals(projectUser.getUserId())) {
+                if (existCompanyProject && newWorkerId.equals(projectUser.getUserId())) {
                     break;
                 }
                 //如果用户不存在关联表中且用户应在项目中,就将用户放入待插入列表,并终止循环
                 if (existCompanyProject) {
                     ProjectUser pu = new ProjectUser();
-                    pu.setProjectId(projectLiftRelevance.getProjectId());
+                    pu.setProjectId(projectId);
                     pu.setUserId(newWorkerId);
-                    pu.setMtCompanyId(projectLiftRelevance.getMtCompanyId());
+                    pu.setMtCompanyId(request.getMtCompanyId());
                     pu.setUserRole(CommonEnum.DefaultRole.MTWORK.getCode());
                     pu.setCreatorId(10000L);
                     pu.setUpdateId(10000L);
@@ -343,6 +346,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
             }
         });
         //批量保存项目用户关联信息
+        log.info("批量保存项目用户关联信息" + insertProjectUsers.size());
         if (insertProjectUsers.size() > 0) {
             if (!projectUserService.saveBatch(insertProjectUsers)) {
                 throw new BusinessBasicException("数据库保存失败");