Updated updateApplicationAmendment API functionality
This commit is contained in:
@@ -8,17 +8,12 @@ import jakarta.servlet.http.HttpServletRequest;
|
|||||||
import net.gepafin.tendermanagement.config.Translator;
|
import net.gepafin.tendermanagement.config.Translator;
|
||||||
import net.gepafin.tendermanagement.constants.GepafinConstant;
|
import net.gepafin.tendermanagement.constants.GepafinConstant;
|
||||||
import net.gepafin.tendermanagement.entities.*;
|
import net.gepafin.tendermanagement.entities.*;
|
||||||
import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
|
import net.gepafin.tendermanagement.enums.*;
|
||||||
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
|
|
||||||
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
|
|
||||||
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
|
|
||||||
import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
|
import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
|
||||||
import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
|
import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
|
||||||
import net.gepafin.tendermanagement.model.request.ApplicationFormFieldRequestBean;
|
import net.gepafin.tendermanagement.model.request.ApplicationFormFieldRequestBean;
|
||||||
import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
|
import net.gepafin.tendermanagement.model.request.CloseAmendmentRequest;
|
||||||
import net.gepafin.tendermanagement.model.response.AmendmentFormFieldResponse;
|
import net.gepafin.tendermanagement.model.response.*;
|
||||||
import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
|
|
||||||
import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse;
|
|
||||||
import net.gepafin.tendermanagement.repositories.*;
|
import net.gepafin.tendermanagement.repositories.*;
|
||||||
import net.gepafin.tendermanagement.service.*;
|
import net.gepafin.tendermanagement.service.*;
|
||||||
import net.gepafin.tendermanagement.util.DateTimeUtil;
|
import net.gepafin.tendermanagement.util.DateTimeUtil;
|
||||||
@@ -75,7 +70,6 @@ public class ApplicationAmendmentRequestDao {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ProtocolDao protocolDao;
|
private ProtocolDao protocolDao;
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private AssignedApplicationsService assignedApplicationsService;
|
private AssignedApplicationsService assignedApplicationsService;
|
||||||
|
|
||||||
@@ -90,6 +84,12 @@ public class ApplicationAmendmentRequestDao {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private SystemEmailTemplatesService systemEmailTemplatesService;
|
private SystemEmailTemplatesService systemEmailTemplatesService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private CallDao callDao;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private DocumentRepository documentRepository;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private HubService hubService;
|
private HubService hubService;
|
||||||
// @Autowired
|
// @Autowired
|
||||||
@@ -315,6 +315,44 @@ public class ApplicationAmendmentRequestDao {
|
|||||||
|
|
||||||
applicationAmendmentRequestResponse.setFormFields(formField);
|
applicationAmendmentRequestResponse.setFormFields(formField);
|
||||||
|
|
||||||
|
List<ApplicationFormFieldEntity> formFieldEntities = applicationFormFieldRepository.findByApplicationFormIdIn(
|
||||||
|
applicationForms.stream().map(ApplicationFormEntity::getId).collect(Collectors.toList())
|
||||||
|
);
|
||||||
|
|
||||||
|
List<ApplicationFormFieldResponseBean> fileDetailResponses = new ArrayList<>();
|
||||||
|
for (AmendmentFormFieldResponse field : formFields) {
|
||||||
|
for (ApplicationFormFieldEntity formFieldEntity : formFieldEntities) {
|
||||||
|
if (formFieldEntity.getFieldId().equals(field.getFieldId()) && formFieldEntity.getFieldValue() != null) {
|
||||||
|
ApplicationFormFieldResponseBean responseBean = new ApplicationFormFieldResponseBean();
|
||||||
|
responseBean.setFieldId(formFieldEntity.getFieldId());
|
||||||
|
|
||||||
|
String[] documentIds = formFieldEntity.getFieldValue().split(",");
|
||||||
|
List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String docId : documentIds) {
|
||||||
|
Long documentId = Long.valueOf(docId.trim());
|
||||||
|
documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> {
|
||||||
|
DocumentResponseBean docBean = new DocumentResponseBean();
|
||||||
|
docBean.setId(documentEntity.getId());
|
||||||
|
docBean.setName(documentEntity.getFileName());
|
||||||
|
docBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
|
||||||
|
docBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
|
||||||
|
docBean.setSourceId(documentEntity.getSourceId());
|
||||||
|
docBean.setFilePath(documentEntity.getFilePath());
|
||||||
|
docBean.setCreatedDate(documentEntity.getCreatedDate());
|
||||||
|
docBean.setUpdatedDate(documentEntity.getUpdatedDate());
|
||||||
|
documentResponseBeans.add(docBean);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
responseBean.setFieldValue(documentResponseBeans);
|
||||||
|
fileDetailResponses.add(responseBean);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
applicationAmendmentRequestResponse.setApplicationFormFields(fileDetailResponses);
|
||||||
|
|
||||||
return applicationAmendmentRequestResponse;
|
return applicationAmendmentRequestResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user