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:
rajesh
2024-11-21 15:11:41 +05:30
parent 2cc9ad5e23
commit 65bc02223d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
View File

@@ -293,6 +293,6 @@ public class GepafinConstant {
public static final String APPLICATION_DOCUMENTS_NOT_FOUND_MSG = "application.documents.not.found"; public static final String APPLICATION_DOCUMENTS_NOT_FOUND_MSG = "application.documents.not.found";
public static final String DUPLICATE_BENEFICIARY_CALL = "beneficiary.call.duplicate"; public static final String DUPLICATE_BENEFICIARY_CALL = "beneficiary.call.duplicate";
public static final String COMPANY_ID_REQUIRED_FOR_PREFERRED_CALL = "company.id.required.for.preferred.call"; public static final String COMPANY_ID_REQUIRED_FOR_PREFERRED_CALL = "company.id.required.for.preferred.call";
public static final String CREATED_DATE = "createdDate"; public static final String SUBMISSION_DATE = "submissionDate";
} }

7
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -337,8 +337,11 @@ public class ApplicationDao {
.collect(Collectors.toList()); .collect(Collectors.toList());
predicate = builder.and(predicate, root.get("status").in(statusNames)); predicate = builder.and(predicate, root.get("status").in(statusNames));
} }
predicate = builder.and(predicate, builder.equal(root.get("hubId"), userEntity.getHub().getId())); query.orderBy(
query.orderBy(builder.desc(root.get(GepafinConstant.CREATED_DATE))); builder.desc(builder.isNotNull(root.get(GepafinConstant.SUBMISSION_DATE))),
builder.desc(root.get(GepafinConstant.SUBMISSION_DATE))
);
return predicate; return predicate;
}; };
} }