Merge branch 'feature/RDMP-3845' into dev
This commit is contained in:
commit
9993ea1c4b
@ -3,6 +3,7 @@ package cn.axzo.workflow.form.service.converter;
|
||||
import cn.axzo.workflow.common.model.request.form.definition.FormFieldDTO;
|
||||
import org.flowable.form.model.FormContainer;
|
||||
import org.flowable.form.model.FormField;
|
||||
import org.flowable.form.model.OptionFormField;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
|
||||
@ -34,6 +35,16 @@ public interface FormFieldConverter extends EntityConverter<FormFieldDTO, FormFi
|
||||
@Mapping(target = "params", source = "entity.params")
|
||||
FormFieldDTO toVo(FormField entity);
|
||||
|
||||
@Mapping(target = "fieldType", expression = "java(entity.getClass().getSimpleName())")
|
||||
@Mapping(target = "id", source = "entity.id")
|
||||
@Mapping(target = "name", source = "entity.name")
|
||||
@Mapping(target = "type", source = "entity.type")
|
||||
@Mapping(target = "value", expression = "java(ConversionUtils.convertObject(entity.getValue()))")
|
||||
@Mapping(target = "placeholder", source = "entity.placeholder")
|
||||
@Mapping(target = "params", source = "entity.params")
|
||||
@Mapping(target = "options", source = "entity.options")
|
||||
FormFieldDTO toVo(OptionFormField entity);
|
||||
|
||||
@Mapping(target = "fieldType", expression = "java(entity.getClass().getSimpleName())")
|
||||
@Mapping(target = "id", source = "entity.id")
|
||||
@Mapping(target = "name", source = "entity.name")
|
||||
@ -50,7 +61,9 @@ public interface FormFieldConverter extends EntityConverter<FormFieldDTO, FormFi
|
||||
for (FormField entity : entities) {
|
||||
if(entity instanceof FormContainer) {
|
||||
dtos.add(toVo((FormContainer) entity));
|
||||
} else{
|
||||
} else if (entity instanceof OptionFormField) {
|
||||
dtos.add(toVo((OptionFormField) entity));
|
||||
} else {
|
||||
dtos.add(toVo((FormField) entity));
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user