Resolved Conflicts.

This commit is contained in:
piyushkag
2024-12-06 14:26:09 +05:30
14 changed files with 84 additions and 30 deletions

View File

@@ -93,4 +93,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
public ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId) {
return applicationEvaluationDao.validateApplicationEvaluation(applicationEvaluationId);
}
@Override
public ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId) {
return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId);
}
}

View File

@@ -110,9 +110,8 @@ public class CompanyServiceImpl implements CompanyService {
@Override
@Transactional
public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId) {
UserEntity userEntity =validator.validateUser(request);
return delegationDao.getCompanyDelegation(userEntity, companyId);
public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId,Long applicationId) {
return delegationDao.getCompanyDelegation(request, companyId,applicationId);
}
@Override
@Transactional(rollbackFor = Exception.class)