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

Resolved conflicts

Browse Source
This commit is contained in:
rajesh
2024-08-28 15:38:56 +05:30
parent d1bcc36c41 60bd39360e
commit ae626f8d14
85 changed files with 2713 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java
View File

@@ -7,7 +7,7 @@ import net.gepafin.tendermanagement.model.request.FormFieldRequest;
import net.gepafin.tendermanagement.model.response.FormFieldResponseBean;
import net.gepafin.tendermanagement.repositories.FormFieldRepository;
import net.gepafin.tendermanagement.service.FormFieldService;
import net.gepafin.tendermanagement.util.ObjectUtils;
import net.gepafin.tendermanagement.util.Utils;
import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
import net.gepafin.tendermanagement.web.rest.api.errors.Status;
@@ -25,7 +25,7 @@ public class FormFieldDao {
public FormFieldEntity convertFormFieldRequestToFormFieldResponseBean(FormFieldRequest formFieldRequest) {
FormFieldEntity formFieldEntity = new FormFieldEntity();
FormFieldEntity formFieldEntity = null;
formFieldEntity.setLabel(formFieldRequest.getLabel());
formFieldEntity.setDefinition(formFieldRequest.getDefinition());
formFieldEntity.setIsActive(true);
@@ -64,9 +64,9 @@ public class FormFieldDao {
}
public FormFieldResponseBean updateFormField(Long formFieldId,FormFieldRequest formFieldRequest){
FormFieldEntity formFieldEntity = formFieldService.getFormFieldEntityById(formFieldId);
ObjectUtils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel());
ObjectUtils.setIfUpdated(formFieldEntity::getDefinition,formFieldEntity::setDefinition,formFieldRequest.getDefinition());
ObjectUtils.setIfUpdated(formFieldEntity::getIsActive,formFieldEntity::setIsActive,formFieldRequest.getIsActive());
Utils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel());
Utils.setIfUpdated(formFieldEntity::getDefinition,formFieldEntity::setDefinition,formFieldRequest.getDefinition());
Utils.setIfUpdated(formFieldEntity::getIsActive,formFieldEntity::setIsActive,formFieldRequest.getIsActive());
formFieldEntity=saveFormFieldEntity(formFieldEntity);
return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity);
}