Fixed issue assigned application issue
This commit is contained in:
@@ -47,7 +47,7 @@ public class AssignedApplicationsDao {
|
|||||||
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED));
|
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED));
|
||||||
}
|
}
|
||||||
ApplicationEntity application = applicationService.validateApplication(applicationId);
|
ApplicationEntity application = applicationService.validateApplication(applicationId);
|
||||||
if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.SUBMIT.equals(application.getStatus()))) {
|
if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.SUBMIT.getValue().equals(application.getStatus()))) {
|
||||||
throw new CustomValidationException(
|
throw new CustomValidationException(
|
||||||
Status.BAD_REQUEST,
|
Status.BAD_REQUEST,
|
||||||
Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS)
|
Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS)
|
||||||
|
|||||||
@@ -230,6 +230,7 @@ public class CallDao {
|
|||||||
criteriaEntity = new EvaluationCriteriaEntity();
|
criteriaEntity = new EvaluationCriteriaEntity();
|
||||||
criteriaEntity.setCall(callEntity);
|
criteriaEntity.setCall(callEntity);
|
||||||
criteriaEntity.setLookupData(lookupDataEntity);
|
criteriaEntity.setLookupData(lookupDataEntity);
|
||||||
|
criteriaEntity.setScore(0L);
|
||||||
criteriaEntity.setIsDeleted(false);
|
criteriaEntity.setIsDeleted(false);
|
||||||
}
|
}
|
||||||
setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore());
|
setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore());
|
||||||
|
|||||||
@@ -50,7 +50,10 @@ public class EvaluationCriteriaDao {
|
|||||||
.validateLookUpData(evaluationCriteriaRequest.getLookUpDataId());
|
.validateLookUpData(evaluationCriteriaRequest.getLookUpDataId());
|
||||||
entity.setCall(callEntity);
|
entity.setCall(callEntity);
|
||||||
entity.setLookupData(looDataEntity);
|
entity.setLookupData(looDataEntity);
|
||||||
entity.setScore(evaluationCriteriaRequest.getScore());
|
entity.setScore(0L);
|
||||||
|
if (evaluationCriteriaRequest.getScore() != null) {
|
||||||
|
entity.setScore(evaluationCriteriaRequest.getScore());
|
||||||
|
}
|
||||||
entity = evaluationCriteriaRepository.save(entity);
|
entity = evaluationCriteriaRepository.save(entity);
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user