Resolved conflicts

This commit is contained in:
nisha
2024-10-22 19:54:51 +05:30
22 changed files with 575 additions and 22 deletions

View File

@@ -85,12 +85,12 @@ public class ApplicationServiceImpl implements ApplicationService {
@Override
@Transactional(readOnly = true)
public List<ApplicationResponse> getAllApplications(HttpServletRequest request, Long callId, Long companyId) {
public List<ApplicationResponse> getAllApplications(HttpServletRequest request, Long callId, Long companyId , String status) {
UserEntity userEntity = validator.validateUser(request);
if (companyId != null) {
validator.validateUserWithCompany(request, companyId);
}
return applicationDao.getAllApplications(userEntity, callId, companyId);
return applicationDao.getAllApplications(userEntity, callId, companyId , status);
}
@Override
@Transactional(rollbackFor = Exception.class)
@@ -116,4 +116,6 @@ public class ApplicationServiceImpl implements ApplicationService {
return applicationDao.validateApplication(request, applicationId);
}
}