|
@@ -7793,7 +7793,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
project.setProjectMainId(mainOptional.get().getId());
|
|
project.setProjectMainId(mainOptional.get().getId());
|
|
project.setCategoryName(mainOptional.get().getCategoryName());
|
|
project.setCategoryName(mainOptional.get().getCategoryName());
|
|
project.setCategory(mainOptional.get().getCategoryId());
|
|
project.setCategory(mainOptional.get().getCategoryId());
|
|
- }else project.setProjectMainName(null);
|
|
|
|
|
|
+ }else {
|
|
|
|
+ project.setProjectMainName(null);
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
|
|
Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
|
|
if(category.isPresent()){
|
|
if(category.isPresent()){
|
|
@@ -7801,7 +7803,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
project.setProjectMainName(null);
|
|
project.setProjectMainName(null);
|
|
project.setCategoryName(category.get().getName());
|
|
project.setCategoryName(category.get().getName());
|
|
project.setCategory(category.get().getId());
|
|
project.setCategory(category.get().getId());
|
|
- }else project.setCategoryName(null);
|
|
|
|
|
|
+ }else {
|
|
|
|
+ project.setCategoryName(null);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if(timeType.getProjectLevelState()==1){
|
|
if(timeType.getProjectLevelState()==1){
|
|
Optional<ProjectLevel> level = projectLevelList.stream().filter(pl -> pl.getProjectLevelName().equals(project.getLevelString())).findFirst();
|
|
Optional<ProjectLevel> level = projectLevelList.stream().filter(pl -> pl.getProjectLevelName().equals(project.getLevelString())).findFirst();
|
|
@@ -7817,7 +7821,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
Optional<ProjectStage> stage = projectStageList.stream().filter(ps -> ps.getProjectStageName().equals(project.getCurrentStageName())).findFirst();
|
|
Optional<ProjectStage> stage = projectStageList.stream().filter(ps -> ps.getProjectStageName().equals(project.getCurrentStageName())).findFirst();
|
|
if(stage.isPresent()){
|
|
if(stage.isPresent()){
|
|
project.setCurrentStageId(stage.get().getId());
|
|
project.setCurrentStageId(stage.get().getId());
|
|
- }else project.setCurrentStageName(null);
|
|
|
|
|
|
+ }else {
|
|
|
|
+ project.setCurrentStageName(null);
|
|
|
|
+ }
|
|
project.setCompanyId(thirdPartyInterface.getCompanyId());
|
|
project.setCompanyId(thirdPartyInterface.getCompanyId());
|
|
project.setCreateDate(LocalDate.now());
|
|
project.setCreateDate(LocalDate.now());
|
|
inertProjectList.add(project);
|
|
inertProjectList.add(project);
|