|
|
@@ -206,11 +206,15 @@ open class ProjectsService( |
|
|
|
if (request.projectId != null && request.projectId > 0) projectRepository.findById(request.projectId) |
|
|
|
.orElseThrow() else Project() |
|
|
|
|
|
|
|
// val duplicateProject = |
|
|
|
// if (request.projectCode != null && request.mainProjectId == null) projectRepository.checkMainProjectByCodeLike(request.projectCode) else null |
|
|
|
|
|
|
|
val duplicateProject = |
|
|
|
if (request.projectCode != null && request.mainProjectId == null) projectRepository.checkMainProjectByCodeLike(request.projectCode) else null |
|
|
|
if (request.projectCode != null) projectRepository.findByCode(request.projectCode) else null |
|
|
|
|
|
|
|
//check duplicate project |
|
|
|
if (!duplicateProject.isNullOrEmpty() && !duplicateProject.contains(request.projectId)) { |
|
|
|
// if (!duplicateProject.isNullOrEmpty() && !duplicateProject.contains(request.projectId)) { |
|
|
|
if (duplicateProject != null) { |
|
|
|
return NewProjectResponse( |
|
|
|
id = request.projectId, |
|
|
|
code = request.projectCode, |
|
|
@@ -226,10 +230,11 @@ open class ProjectsService( |
|
|
|
project.apply { |
|
|
|
name = request.projectName |
|
|
|
description = request.projectDescription |
|
|
|
code = if (request.mainProjectId != null && mainProject != null && request.projectCode == null) createSubProjectCode( |
|
|
|
mainProject, |
|
|
|
project |
|
|
|
) else request.projectCode |
|
|
|
// code = if (request.mainProjectId != null && mainProject != null && request.projectCode == null) createSubProjectCode( |
|
|
|
// mainProject, |
|
|
|
// project |
|
|
|
// ) else request.projectCode |
|
|
|
code = request.projectCode |
|
|
|
expectedTotalFee = request.expectedProjectFee |
|
|
|
subContractFee = request.subContractFee |
|
|
|
totalManhour = request.totalManhour |
|
|
|