BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

Browse Source
This commit is contained in:
nisha
2024-10-30 13:47:41 +05:30
parent 03c9ec8f8a 741997f967
commit 85d90107d9
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
View File

@@ -15,12 +15,10 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
Optional<AssignedApplicationsEntity> findByIdAndIsDeletedFalse(Long id); Optional<AssignedApplicationsEntity> findByIdAndIsDeletedFalse(Long id);
@Query("SELECT aa FROM AssignedApplicationsEntity aa WHERE aa.isDeleted = false " + @Query("SELECT aa FROM AssignedApplicationsEntity aa WHERE aa.isDeleted = false " +
"AND (:applicationId IS NULL OR aa.application.id = :applicationId) " + "AND (:applicationId IS NULL OR aa.application.id = :applicationId) " +
"AND (:id IS NULL OR aa.id = :id) " + "AND (:id IS NULL OR aa.id = :id) ")
"AND (:userId IS NULL OR aa.userId = :userId)") Optional<AssignedApplicationsEntity> findByApplicationIdOrIdAndIsDeletedFalse(
Optional<AssignedApplicationsEntity> findByApplicationIdOrIdAndUserIdAndIsDeletedFalse(
@Param("applicationId") Long applicationId, @Param("applicationId") Long applicationId,
@Param("id") Long id, @Param("id") Long id);
@Param("userId") Long userId);

2
src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
View File

@@ -65,7 +65,7 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
} }
UserEntity preInstructor = validator.validateUser(request); UserEntity preInstructor = validator.validateUser(request);
Optional<AssignedApplicationsEntity> assignedApplicationsOptional = Optional<AssignedApplicationsEntity> assignedApplicationsOptional =
assignedApplicationsRepository.findByApplicationIdOrIdAndUserIdAndIsDeletedFalse(applicationId,assignedApplicationId, preInstructor.getId()); assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId);
if (assignedApplicationId != null) { if (assignedApplicationId != null) {
assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId)); assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId));