|
@@ -276,9 +276,8 @@ public class ProjectLibManage { |
|
|
? Boolean.TRUE : Boolean.FALSE; |
|
|
? Boolean.TRUE : Boolean.FALSE; |
|
|
//采取批量删除 批量添加的方式 |
|
|
//采取批量删除 批量添加的方式 |
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
.eq(ProjectApplication::getProjectId,project.getId())); |
|
|
|
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
|
|
|
.eq(ProjectApplication::getProjectCode,project.getProjectCode())); |
|
|
|
|
|
|
|
|
.eq(ProjectApplication::getProjectCode,project.getProjectCode()) |
|
|
|
|
|
.eq(ProjectApplication::getProjectVersion,project.getVersion())); |
|
|
if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) { |
|
|
if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) { |
|
|
Project finalProject = project; |
|
|
Project finalProject = project; |
|
|
List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> { |
|
|
List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> { |
|
@@ -289,6 +288,7 @@ public class ProjectLibManage { |
|
|
projectApplication.setProjectCode(finalProject.getProjectCode()); |
|
|
projectApplication.setProjectCode(finalProject.getProjectCode()); |
|
|
projectApplication.setBuildOrgCode(finalProject.getBuildOrgCode()); |
|
|
projectApplication.setBuildOrgCode(finalProject.getBuildOrgCode()); |
|
|
projectApplication.setBuildOrgName(finalProject.getBuildOrgName()); |
|
|
projectApplication.setBuildOrgName(finalProject.getBuildOrgName()); |
|
|
|
|
|
projectApplication.setProjectVersion(finalProject.getVersion()); |
|
|
return projectApplication; |
|
|
return projectApplication; |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
projectApplicationService.saveOrUpdateBatch(applications); |
|
|
projectApplicationService.saveOrUpdateBatch(applications); |
|
@@ -402,9 +402,8 @@ public class ProjectLibManage { |
|
|
? Boolean.TRUE : Boolean.FALSE; |
|
|
? Boolean.TRUE : Boolean.FALSE; |
|
|
//采取批量删除 批量添加的方式 |
|
|
//采取批量删除 批量添加的方式 |
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
.eq(ProjectApplication::getProjectId,project.getId())); |
|
|
|
|
|
projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class) |
|
|
|
|
|
.eq(ProjectApplication::getProjectCode,project.getProjectCode())); |
|
|
|
|
|
|
|
|
.eq(ProjectApplication::getProjectCode,project.getProjectCode()) |
|
|
|
|
|
.eq(ProjectApplication::getProjectVersion,project.getVersion())); |
|
|
if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) { |
|
|
if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) { |
|
|
Project finalProject = project; |
|
|
Project finalProject = project; |
|
|
List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> { |
|
|
List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> { |
|
@@ -413,6 +412,7 @@ public class ProjectLibManage { |
|
|
projectApplication.setId(null); |
|
|
projectApplication.setId(null); |
|
|
projectApplication.setProjectId(finalProject.getId()); |
|
|
projectApplication.setProjectId(finalProject.getId()); |
|
|
projectApplication.setProjectCode(finalProject.getProjectCode()); |
|
|
projectApplication.setProjectCode(finalProject.getProjectCode()); |
|
|
|
|
|
projectApplication.setProjectVersion(finalProject.getVersion()); |
|
|
return projectApplication; |
|
|
return projectApplication; |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
projectApplicationService.saveOrUpdateBatch(applications); |
|
|
projectApplicationService.saveOrUpdateBatch(applications); |
|
|