修改地图

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java

@@ -37,10 +37,13 @@ public class DynamicFormInitDto implements Serializable{
     @ApiModelProperty(value = "提交表单附加字段")
     private DynamicFormInstanceDto   formItemDescr;
     
-    @ApiModelProperty(value = "接口地址")
+    @ApiModelProperty(value = "配置")
     private String columnConfig;
     
     private int sort;
+
+  @ApiModelProperty(value = "接口地址")
+  private String url;
     
 	public DynamicFormInitDto() {
 		

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java

@@ -66,6 +66,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 
     		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<>();
     		queryWrapper.eq("group_code", code);
+				queryWrapper.eq("is_delete", false);
     		queryWrapper.orderByAsc("sort");
     		List<DynamicFormColumn> dynamicFormColumn = this.list(queryWrapper);
     		List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
@@ -76,9 +77,9 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     					dynamicForm.getFieldType().equals("string") || 
     					dynamicForm.getFieldType().equals("datetime") || 
     					dynamicForm.getFieldType().equals("textarea") || 
-    					dynamicForm.getFieldType().equals("upload") || 
-    					dynamicForm.getFieldType().equals("tagging") || 
-    					dynamicForm.getFieldType().equals("inputBitmap")) {
+    					dynamicForm.getFieldType().equals("upload") ||
+							dynamicForm.getFieldType().equals("tagging") ||
+							dynamicForm.getFieldType().equals("inputBitmap")) {
 
     				DynamicFormInitDto vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
     						dynamicForm.getFieldType(), new SelectItems(), null);
@@ -161,6 +162,20 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				vo.setSort(dynamicFormValue.getSort());
 	    				listForm.add(vo);
 						break;
+						case "url":
+								vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
+										dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), columnConfigJson.toJSONString());
+							  vo.setUrl(columnConfigJson.getString("url"));
+								dynamicFormValue = new DynamicFormInstanceDto();
+								BeanUtils.copyProperties(dynamicForm, dynamicFormValue);
+								dynamicFormValue.setSequenceNbr(null);
+								dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
+								dynamicFormValue.setAppKey(appKey);
+
+								vo.setFormItemDescr(dynamicFormValue);
+								vo.setSort(dynamicFormValue.getSort());
+								listForm.add(vo);
+								break;
 					default:
 						vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
 	    						dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), null);