Resolved Conflicts

This commit is contained in:
harish
2024-10-29 17:07:04 +05:30
10 changed files with 451 additions and 458 deletions

View File

@@ -59,7 +59,7 @@ public class ApplicationAmendmentRequestDao {
private ApplicationFormFieldRepository applicationFormFieldRepository;
@Autowired
private CommunicationDao communicationDao;
private EmailNotificationDao emailNotificationDao;
@Autowired
private ApplicationEvaluationService applicationEvaluationService;
@@ -177,7 +177,7 @@ public class ApplicationAmendmentRequestDao {
ApplicationAmendmentRequestResponse applicationAmendmentRequestResponse = convertEntityToResponse(applicationAmendmentRequestEntity);
log.info("Application submitted successfully for amendment", applicationAmendmentRequestResponse);
if(Boolean.TRUE.equals(applicationAmendmentRequestResponse.isSendEmail())){
communicationDao.sendMailToNotifyBeneficiaryRegardingNewAmendment(applicationAmendmentRequestEntity);
emailNotificationDao.sendMailToNotifyBeneficiaryRegardingNewAmendment(applicationAmendmentRequestEntity);
}
return applicationAmendmentRequestResponse;
}