diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java index 61d9448b0..4f905b782 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java @@ -18,6 +18,7 @@ import com.microservices.pms.enums.ProjectIssueStatus; import com.microservices.pms.product.domain.PmsProductRequirement; import com.microservices.pms.product.service.IPmsProductRequirementService; import com.microservices.pms.project.domain.*; +import com.microservices.pms.project.domain.vo.PmsProjectInputVo; import com.microservices.pms.project.domain.vo.PmsProjectIssuesInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestReportInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestsheetCaseInputVo; @@ -82,6 +83,9 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { @Autowired @Lazy private IPmsProductRequirementService pmsProductRequirementService; + @Autowired + @Lazy + private IPmsProjectService pmsProjectService; private static final String INITIALIZE_NAME = "【示例%s】研发示例%s"; @@ -423,14 +427,12 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { } private Long initializePmsProject(Long id, Long creatorGitLinkUserId) { - PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(id); - PmsProject pmsProject = new PmsProject(); - pmsProject.setPmsEnterpriseId(id); + // 创建项目 + PmsProjectInputVo pmsProjectInputVo = new PmsProjectInputVo(); + pmsProjectInputVo.setPmsEnterpriseId(id); String name = "项目"; - pmsProject.setProjectName(String.format(INITIALIZE_NAME, name, name)); - pmsProject.setProjectAssigneeId(creatorGitLinkUserId); - pmsProject.setDeptId(pmsEnterprise.getDeptId()); - pmsProjectMapper.insertPmsProject(pmsProject); - return pmsProject.getId(); + pmsProjectInputVo.setProjectName(String.format(INITIALIZE_NAME, name, name)); + pmsProjectInputVo.setProjectAssigneeId(creatorGitLinkUserId); + return (long) pmsProjectService.insertPmsProject(pmsProjectInputVo); } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java index 4f3b897c2..73d639445 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java @@ -183,7 +183,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService } PmsProject pmsProject = pmsProjectInputVo.toPmsProject(); pmsProject.setDeptId(pmsEnterprise.getDeptId()); - int count = pmsProjectMapper.insertPmsProject(pmsProject); + pmsProjectMapper.insertPmsProject(pmsProject); //同步新增项目-仓库数据 if (StringUtils.isNotEmpty(pmsProjectInputVo.getProjectRepositoryIds())) { List repositoryIdList = Arrays.asList(pmsProjectInputVo.getProjectRepositoryIds().split(",")); @@ -220,7 +220,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService } } } - return count; + return pmsProject.getId().intValue(); } /**