260714_01_ENH: 테스트 서버에서 기동 후 중간 테스트를 위한 커밋

This commit is contained in:
2026-07-14 10:01:05 +09:00
parent 88d65bebe0
commit 50ecd6bf6b
162 changed files with 6790 additions and 907 deletions

View File

@@ -74,7 +74,7 @@ public class ProjectService {
}
public List<ProjectInfoDto> getTopProject(int topCount, String keyword, String userId,
Integer userRole) {
String userCmpn, Integer userRole) {
Specification<TPrjctEntity> spec =
ProjectSpecs.keywordLike(keyword)
.and(ProjectSpecs.isDelFalse());
@@ -85,7 +85,9 @@ public class ProjectService {
} else {
spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1));
}
spec = spec.and(ProjectSpecs.assignedToUserAndNotExcluded(userId));
spec = spec.and(userRole >= ContactConstant.FIELDWORK_USER_ROLE
? ProjectSpecs.assignedToUserAndNotExcluded(userId)
: ProjectSpecs.assignedToCmpn(userCmpn));
}
Pageable pageable = PageRequest.of(0, topCount, Sort.by(Sort.Direction.DESC, "regDt"));
@@ -98,7 +100,7 @@ public class ProjectService {
}
public PageResponseDto<ProjectInfoDto> searchProject(ProjectSearchRequestDto req, String userId,
Integer userRole) {
String userCmpn, Integer userRole) {
Specification<TPrjctEntity> spec =
ProjectSpecs.keywordLike(req.getPrjctText())
.and(ProjectSpecs.isDelFalse())
@@ -112,7 +114,9 @@ public class ProjectService {
} else {
spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1));
}
spec = spec.and(ProjectSpecs.assignedToUserAndNotExcluded(userId));
spec = spec.and(userRole >= ContactConstant.FIELDWORK_USER_ROLE
? ProjectSpecs.assignedToUserAndNotExcluded(userId)
: ProjectSpecs.assignedToCmpn(userCmpn));
}
PageRequestDto pageReq = req.getPageRequest();
@@ -169,7 +173,7 @@ public class ProjectService {
entity.updateFrom(req.getProjectInfo(), modUser, modDt);
assignService.upsertPrjctOutsourceAssign(prjctIdx, req.getAssignUserIdList(), modUser, modDt);
assignService.upsertPrjctCmpnAssign(prjctIdx, req.getAssignCmpnIdList(), modUser, modDt);
resultCodeService.updateResultCode(prjctIdx, req.getResultCodeList(), modUser, modDt);
}