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

Updated code

Browse Source
This commit is contained in:
nisha
2025-01-13 13:00:04 +05:30
parent 3b8246987e
commit b4877b588c
16 changed files with 110 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
View File

@@ -54,13 +54,14 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
@Query("SELECT SUM(a.amountRequested) " +
"FROM ApplicationEntity a " +
"WHERE a.hubId = :hubId AND a.status = 'SUBMIT'")
"WHERE a.hubId = :hubId AND a.status IN ('SUBMIT', 'SOCCORSO', 'APPROVED', 'EVALUATION', 'APPOINTMENT', 'NDG', 'ADMISSIBLE','REJECTED')")
BigDecimal findTotalAmountRequestedOfApplication(@Param("hubId") Long hubId);
@Query("SELECT SUM(a.amountAccepted) " +
"FROM ApplicationEntity a " +
"WHERE a.hubId = :hubId AND a.status = 'APPROVED'")
BigDecimal findTotalAmountAcceptedOfApplication(@Param("hubId") Long hubId);
@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.status = 'SUBMIT' AND a.isDeleted = false")
public Long countApplicationsByHubId(@Param("hubId") Long hubId);

23
src/main/java/net/gepafin/tendermanagement/repositories/UserActionsRepository.java
View File

@@ -13,27 +13,6 @@ import java.util.List;
@Repository
public interface UserActionsRepository extends JpaRepository<UserActionEntity, Long> {
UserActionEntity findUserActionById(Long id);
//
// @Query("SELECT ua FROM UserActionEntity ua " +
// "JOIN ua.user u " +
// "WHERE u.roleEntity.roleType IN :roleNames " +
// "AND ua.hub.id = :hubId " +
// "AND ua.isDeleted = false")
// Page<UserActionEntity> findActionsByRoleNamesAndHubId(
// @Param("roleNames") List<String> roleNames,
// @Param("hubId") Long hubId, Pageable pageable);
@Query("SELECT ua FROM UserActionEntity ua " +
"JOIN UserEntity u ON ua.userId = u.id " + // Join on userId field
"JOIN u.roleEntity r " + // Join the RoleEntity via the UserEntity
"WHERE r.roleType IN :roleNames " + // Filter by role name
"AND ua.hubId = :hubId " + // Filter by hubId
"AND ua.isDeleted = false")
Page<UserActionEntity> findActionsByRoleNamesAndHubId(
@Param("roleNames") List<String> roleNames,
@Param("hubId") Long hubId,
Pageable pageable);
UserActionEntity findUserActionByIdAndIsDeletedFalse(Long id);
}