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

Done ticket GEPAFINBE-233

Browse Source
This commit is contained in:
rajesh
2025-07-03 17:28:53 +05:30
parent b4831ce348
commit f1aadafa1a
8 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -989,9 +989,11 @@ public class ApplicationDao {
// call = callService.validatePublishedCall(call.getId());
// checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
HubEntity hubEntity = hubService.valdateHub(call.getHub().getId());
if(call.getAllowMultipleApplications() == null || Boolean.FALSE.equals(call.getAllowMultipleApplications())){
if(hubEntity.getUniqueUuid().equals(defaultHubUuid)){
checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
}
}
ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity);
applicationEntity.setComments(applicationRequest.getComments());
applicationEntity = saveApplicationEntity(applicationEntity);

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

@@ -224,6 +224,10 @@ public class CallDao {
callEntity.setHub(userEntity.getHub());
callEntity.setNumberOfCheck(createCallRequest.getNumberOfCheck());
callEntity.setAppointmentTemplateId(createCallRequest.getAppointmentTemplateId());
callEntity.setAllowMultipleApplications(false);
if (createCallRequest.getAllowMultipleApplications() != null) {
callEntity.setAllowMultipleApplications(createCallRequest.getAllowMultipleApplications());
}
callEntity = callRepository.save(callEntity);
log.info("CallEntity saved with ID: {} for call name: '{}'", callEntity.getId(), callEntity.getName());
@@ -406,6 +410,7 @@ public class CallDao {
createCallResponseBean.setDocumentationRequested(callEntity.getDocumentationRequested());
createCallResponseBean.setPriorityArea(callEntity.getPriorityArea());
createCallResponseBean.setConfidi(callEntity.getConfidi());
createCallResponseBean.setAllowMultipleApplications(callEntity.getAllowMultipleApplications());
createCallResponseBean.setAmountMin(callEntity.getAmountMin());
createCallResponseBean.setPhoneNumber(callEntity.getPhoneNumber());
createCallResponseBean.setEndTime(callEntity.getEndTime());
@@ -683,6 +688,7 @@ public class CallDao {
setIfUpdated(callEntity::getEvaluationVersion, callEntity::setEvaluationVersion, updateCallRequest.getEvaluationVersion().getValue());
setIfUpdated(callEntity::getNumberOfCheck, callEntity::setNumberOfCheck, updateCallRequest.getNumberOfCheck());
setIfUpdated(callEntity::getAppointmentTemplateId, callEntity::setAppointmentTemplateId, updateCallRequest.getAppointmentTemplateId());
setIfUpdated(callEntity::getAllowMultipleApplications, callEntity::setAllowMultipleApplications, updateCallRequest.getAllowMultipleApplications());
callEntity = callRepository.save(callEntity);
/** This code is responsible for adding a version history log for the "update call step 1" operation **/
@@ -792,6 +798,7 @@ public class CallDao {
callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate());
callDetailsResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
callDetailsResponseBean.setAppointmentTemplateId(callEntity.getAppointmentTemplateId());
callDetailsResponseBean.setAllowMultipleApplications(callEntity.getAllowMultipleApplications());
return callDetailsResponseBean;
}

3
src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
View File

@@ -99,5 +99,8 @@ public class CallEntity extends BaseEntity {
@Column(name = "APPOINTMENT_TEMPLATE_ID")
private Long appointmentTemplateId;
@Column(name = "allow_multiple_applications")
private Boolean allowMultipleApplications;
}

2
src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
View File

@@ -44,6 +44,8 @@ public class CreateCallRequestStep1 {
private Boolean confidi;
private Boolean allowMultipleApplications;
private List<FaqReq> faq;
private EvaluationVersionEnum evaluationVersion;

2
src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
View File

@@ -38,6 +38,8 @@ public class UpdateCallRequestStep1 {
private Boolean confidi;
private Boolean allowMultipleApplications;
private List<FaqReq> faq;
private Long numberOfCheck;

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

@@ -23,6 +23,8 @@ public class CallDetailsResponseBean {
private Boolean confidi;
private Boolean allowMultipleApplications;
private CallStatusEnum status;
private Long regionId;

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

@@ -44,6 +44,8 @@ public class CallResponse {
private Boolean confidi;
private Boolean allowMultipleApplications;
private BigDecimal amountMin;
private String email;

6
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -2984,4 +2984,10 @@
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_technical_evaluation_rejected.sql"/>
</changeSet>
<changeSet id="02-07-2025_RK_152053" author="Rajesh Khore">
<addColumn tableName="call">
<column name="allow_multiple_applications" type="BOOLEAN" defaultValueBoolean="false"></column>
</addColumn>
</changeSet>
</databaseChangeLog>