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

Added companyName in assigned application response

Browse Source
This commit is contained in:
rajesh
2024-11-22 12:52:22 +05:30
parent 2e0c432da5
commit ccd5d9408a
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,5 +295,6 @@ public class GepafinConstant {
public static final String USER_MUST_BE_ASSOCIATED_WITH_COMPANY="user.must.be.associated.with.company.to.create.application"; public static final String USER_MUST_BE_ASSOCIATED_WITH_COMPANY="user.must.be.associated.with.company.to.create.application";
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 SUBMISSION_DATE = "submissionDate"; public static final String SUBMISSION_DATE = "submissionDate";
public static final String ASSIGNED_AT = "assignedAt";
} }

5
src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
View File

@@ -128,6 +128,7 @@ public class AssignedApplicationsDao {
assignedApplicationsResponse.setAssignedAt(assignedApplications.getAssignedAt()); assignedApplicationsResponse.setAssignedAt(assignedApplications.getAssignedAt());
assignedApplicationsResponse.setProtocolNumber(protocolNumber); assignedApplicationsResponse.setProtocolNumber(protocolNumber);
assignedApplicationsResponse.setCallName(callName); assignedApplicationsResponse.setCallName(callName);
assignedApplicationsResponse.setCompanyName(application.getCompany().getCompanyName());
assignedApplicationsResponse.setBeneficiaryName(beneficiaryName); assignedApplicationsResponse.setBeneficiaryName(beneficiaryName);
assignedApplicationsResponse.setSubmissionDate(submissionDate); assignedApplicationsResponse.setSubmissionDate(submissionDate);
assignedApplicationsResponse.setCallEndDate(callEndDate); assignedApplicationsResponse.setCallEndDate(callEndDate);
@@ -171,6 +172,10 @@ public class AssignedApplicationsDao {
if (userId != null) { if (userId != null) {
predicate = builder.and(predicate, builder.equal(root.get("userId"), userId)); predicate = builder.and(predicate, builder.equal(root.get("userId"), userId));
} }
query.orderBy(
builder.desc(builder.isNotNull(root.get(GepafinConstant.ASSIGNED_AT))),
builder.desc(root.get(GepafinConstant.ASSIGNED_AT))
);
predicate = builder.and(predicate, builder.equal(root.get("application").get("hubId"), hubId)); predicate = builder.and(predicate, builder.equal(root.get("application").get("hubId"), hubId));
return predicate; return predicate;
}; };

1
src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
View File

@@ -20,6 +20,7 @@ public class AssignedApplicationsResponse extends BaseBean {
private LocalDateTime submissionDate; private LocalDateTime submissionDate;
private LocalDateTime callStartDate; private LocalDateTime callStartDate;
private LocalDateTime callEndDate; private LocalDateTime callEndDate;
private String companyName;
} }