Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '初始化项目将负责人加入项目成员中' (#635) from dev_PMS into dev_PMS_ZPK

This commit is contained in:
wanjia9506 2024-08-22 15:14:30 +08:00
parent e890274f5a 26f74bb5a8
commit 88e4690ad9
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java
View File

@ -18,7 +18,6 @@ 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;
@ -62,6 +61,9 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService {
private IPmsEnterpriseService pmsEnterpriseService;
@Resource
private PmsProjectMapper pmsProjectMapper;
@Autowired
private IPmsProjectMembersService pmsProjectMembersService;
@Resource
private PmsProjectSprintMapper pmsProjectSprintMapper;
@Autowired
@ -79,9 +81,7 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService {
@Autowired
@Lazy
private IPmsProductRequirementService pmsProductRequirementService;
@Autowired
@Lazy
private IPmsProjectService pmsProjectService;
private static final String INITIALIZE_NAME = "【示例%s】研发示例%s";
@ -402,13 +402,18 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService {
}
private Long initializePmsProject(Long id, Long creatorGitLinkUserId) {
// 创建项目
PmsProjectInputVo pmsProjectInputVo = new PmsProjectInputVo();
pmsProjectInputVo.setPmsEnterpriseId(id);
PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(id);
PmsProject pmsProject = new PmsProject();
pmsProject.setPmsEnterpriseId(id);
String name = "项目";
pmsProjectInputVo.setProjectName(String.format(INITIALIZE_NAME, name, name));
pmsProjectInputVo.setProjectAssigneeId(creatorGitLinkUserId);
pmsProjectInputVo.setPmsProjectMemberIds(String.valueOf(creatorGitLinkUserId));
return (long) pmsProjectService.insertPmsProject(pmsProjectInputVo);
pmsProject.setProjectName(String.format(INITIALIZE_NAME, name, name));
pmsProject.setProjectAssigneeId(creatorGitLinkUserId);
pmsProject.setDeptId(pmsEnterprise.getDeptId());
pmsProjectMapper.insertPmsProject(pmsProject);
PmsProjectMembers pmsProjectMembers = new PmsProjectMembers();
pmsProjectMembers.setPmsProjectMemberId(creatorGitLinkUserId);
pmsProjectMembers.setPmsProjectId(pmsProject.getId());
pmsProjectMembersService.insertPmsProjectMembers(pmsProjectMembers);
return pmsProject.getId();
}
}

4
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java
View File

@ -111,7 +111,9 @@ public class PmsProjectMembersServiceImpl implements IPmsProjectMembersService
public int insertPmsProjectMembers(PmsProjectMembers pmsProjectMembers)
{
SimpleSysUser user = pmsCommonService.getSimpleSysUserByGitlinkUserId(pmsProjectMembers.getPmsProjectMemberId());
pmsProjectMembers.setUserId(user.getUserId());
if (user != null) {
pmsProjectMembers.setUserId(user.getUserId());
}
pmsProjectService.selectAndCheckPmsProjectById(pmsProjectMembers.getPmsProjectId());
boolean exist = pmsProjectMembersMapper.countPmsProjectMembersByProjectIdAndMemberId(
pmsProjectMembers.getPmsProjectId(),