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

Resolved conflict

Browse Source
This commit is contained in:
rajesh
2025-11-11 15:39:55 +05:30
parent 05c3c95b65 f6d2583b77
commit d3ea89c266
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,6 +157,9 @@ public class ApplicationEvaluationDao {
@Autowired @Autowired
private ApplicationSignedDocumentRepository applicationSignedDocumentRepository; private ApplicationSignedDocumentRepository applicationSignedDocumentRepository;
@Autowired
private ApplicationContractDao applicationContractDao;
private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) { private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) {
ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity();
@@ -1193,6 +1196,8 @@ public class ApplicationEvaluationDao {
ApplicationEvaluationResponse applicationEvaluationResponse = convertToResponse(entity); ApplicationEvaluationResponse applicationEvaluationResponse = convertToResponse(entity);
applicationEvaluationResponse.setSignedDocument(getApplicationSignedDocument(entity)); applicationEvaluationResponse.setSignedDocument(getApplicationSignedDocument(entity));
applicationEvaluationResponse.setEmailSendResponse(entity.getEmailSendResponse()); applicationEvaluationResponse.setEmailSendResponse(entity.getEmailSendResponse());
ApplicationContractResponse applicationContractResponse=applicationContractDao.getContractByApplicationId(applicationID);
applicationEvaluationResponse.setContract(applicationContractResponse);
return applicationEvaluationResponse; return applicationEvaluationResponse;
} }
public List<EvaluationDocumentRequest> prepareEvaluationDocumentBeanList(ApplicationEvaluationEntity entity) { public List<EvaluationDocumentRequest> prepareEvaluationDocumentBeanList(ApplicationEvaluationEntity entity) {
@@ -2423,6 +2428,8 @@ public class ApplicationEvaluationDao {
response.setCompanyCodiceAteco(company.getCodiceAteco()); response.setCompanyCodiceAteco(company.getCodiceAteco());
response.setSignedDocument(getApplicationSignedDocument(evaluationEntity)); response.setSignedDocument(getApplicationSignedDocument(evaluationEntity));
response.setEmailSendResponse(evaluationEntity.getEmailSendResponse()); response.setEmailSendResponse(evaluationEntity.getEmailSendResponse());
ApplicationContractResponse applicationContractResponse=applicationContractDao.getContractByApplicationId(evaluationEntity.getApplicationId());
response.setContract(applicationContractResponse);
return response; return response;
} }

2
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
View File

@@ -50,5 +50,7 @@ public class ApplicationEvaluationFormResponse {
private String companyCodiceAteco; private String companyCodiceAteco;
private List<EmailSendResponse> emailSendResponse; private List<EmailSendResponse> emailSendResponse;
private ApplicationSignedDocumentResponse signedDocument; private ApplicationSignedDocumentResponse signedDocument;
private ApplicationContractResponse contract;
} }

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

@@ -52,5 +52,6 @@ public class ApplicationEvaluationResponse {
private List<EmailSendResponse> emailSendResponse; private List<EmailSendResponse> emailSendResponse;
private List<DocumentResponseBean> rejectedDocument; private List<DocumentResponseBean> rejectedDocument;
private ApplicationSignedDocumentResponse signedDocument; private ApplicationSignedDocumentResponse signedDocument;
private ApplicationContractResponse contract;
} }

4
src/main/resources/application.properties
View File

@@ -27,8 +27,8 @@ springdoc.swagger-ui.tagsSorter=alpha
call.id=10 call.id=10
#aws configuration #aws configuration
aws.access.key.id=AKIAVWDQWCUENKE7QGXP aws.access.key.id=AKIAVWDQWCUEFJP3T6OP
aws.secret.access.key=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 aws.secret.access.key=jIBZs8TUTt5T7bKnHkNGzs76Bl4omYoBhF2Pc9TE
aws.s3.region=eu-west-1 aws.s3.region=eu-west-1
aws.s3.bucket.name=mementoresources aws.s3.bucket.name=mementoresources
aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/ aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/