Resolved Conflicts
This commit is contained in:
@@ -122,7 +122,7 @@ public class ApplicationAmendmentScheduler {
|
||||
.findEvaluationsWithoutActiveAmendmentsByIds(applicationEvaluationIds);
|
||||
evaluationsWithoutActiveAmendmentList.forEach(evaluation -> {
|
||||
try {
|
||||
applicationAmendmentRequestDao.calculateEndDateAndSuspensionDays(evaluation);
|
||||
applicationAmendmentRequestDao.calculateEndDateAndSuspensionDaysOnExpirationOrClosing(evaluation);
|
||||
|
||||
updateEvaluationStatus(evaluation);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user