初始化项目库-法规、认证清单 用户角色修改。
This commit is contained in:
+39
-18
@@ -21,16 +21,7 @@ import com.jero.modules.project.entity.ProjectRelatedPersonnel;
|
||||
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
|
||||
import com.jero.modules.project.entity.ProjectTaskPlanning;
|
||||
import com.jero.modules.project.entity.ProjectUserPermission;
|
||||
import com.jero.modules.project.enums.CertificationProgressEnum;
|
||||
import com.jero.modules.project.enums.CurrentProjectStatusEnum;
|
||||
import com.jero.modules.project.enums.DesignComplianceStatusEnum;
|
||||
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
|
||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||
import com.jero.modules.project.enums.PermissionDescriptionEnum;
|
||||
import com.jero.modules.project.enums.ProjectRoleEnum;
|
||||
import com.jero.modules.project.enums.ProjectUserLocationEnum;
|
||||
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
|
||||
import com.jero.modules.project.enums.TopEnum;
|
||||
import com.jero.modules.project.enums.*;
|
||||
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
|
||||
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
|
||||
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
|
||||
@@ -186,12 +177,23 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
||||
//创建任务计划时间轴
|
||||
projectTaskPlanningService.setProjectTaskPlanning(projectLibraryBase.getId());
|
||||
|
||||
//初始化当前项目的studio与项目库 角色关系
|
||||
ProjectLibraryRoleRelEO projectLibraryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
projectLibraryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
projectLibraryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
projectLibraryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);
|
||||
List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
|
||||
//初始化当前项目的studio与项目库 法规清单 角色关系
|
||||
ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
|
||||
projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
|
||||
|
||||
// 初始化当前项目的studio与项目库 认证清单 角色关系
|
||||
ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
|
||||
projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
|
||||
this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
|
||||
|
||||
//项目权限表添加
|
||||
List<ProjectUserPermission> adds = new ArrayList<>();
|
||||
@@ -393,12 +395,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
||||
delCertificationPermission.eq("project_id", projectLibraryBase.getId()).eq("belong", ProjectUserLocationEnum.PROJECT_ADD_CERTIFICATION.getValue());
|
||||
projectUserPermissionService.remove(delCertificationPermission);
|
||||
|
||||
// 初始化当前项目的studio与项目库 角色关系
|
||||
/*// 初始化当前项目的studio与项目库 角色关系
|
||||
ProjectLibraryRoleRelEO projectLibraryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
projectLibraryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
projectLibraryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
projectLibraryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);
|
||||
projectLibraryRoleRelEOService.add(projectLibraryRoleRelEO);*/
|
||||
|
||||
List<ProjectLibraryRoleRelEO> projectLibraryRoleRelEOList = new ArrayList<>();
|
||||
//初始化当前项目的studio与项目库 法规清单 角色关系
|
||||
ProjectLibraryRoleRelEO lawsInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
lawsInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
lawsInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
lawsInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
lawsInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
|
||||
projectLibraryRoleRelEOList.add(lawsInventoryRoleRelEO);
|
||||
|
||||
// 初始化当前项目的studio与项目库 认证清单 角色关系
|
||||
ProjectLibraryRoleRelEO certificationInventoryRoleRelEO = new ProjectLibraryRoleRelEO();
|
||||
certificationInventoryRoleRelEO.setProjectLibraryId(projectLibraryBase.getId());
|
||||
certificationInventoryRoleRelEO.setUserId(projectLibraryBase.getStudioEngineer());
|
||||
certificationInventoryRoleRelEO.setRoleCode(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||
certificationInventoryRoleRelEO.setModelType(RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue());
|
||||
projectLibraryRoleRelEOList.add(certificationInventoryRoleRelEO);
|
||||
this.projectLibraryRoleRelEOService.saveBatch(projectLibraryRoleRelEOList);
|
||||
|
||||
//重新设置当前项目studio项目权限
|
||||
List<ProjectUserPermission> engineers = new ArrayList<>();
|
||||
ProjectUserPermission studioPermission = new ProjectUserPermission();
|
||||
|
||||
Reference in New Issue
Block a user