Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -40,6 +40,7 @@ public class DynamicFormInitDto implements Serializable{
     @ApiModelProperty(value = "接口地址")
     private String columnConfig;
     
+    private int sort;
     
 	public DynamicFormInitDto() {
 		

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormColumnMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface DynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> {
 
+	List<DynamicFormInstanceDto> getDynamicFormInstanceList(String groupCode);
+
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -94,6 +95,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     					vo.setDefaultValue(date);
     				}
     				vo.setFormItemDescr(dynamicFormValue);
+    				vo.setSort(dynamicFormValue.getSort());
     				listfrom.add(vo);
     			} else {
     				// 查询数据项
@@ -119,6 +121,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				}
 
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					case "action":
@@ -130,6 +133,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
 	    				dynamicFormValue.setAppKey(appKey);
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					case "dict":
@@ -153,6 +157,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				}
 
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					default:
@@ -162,14 +167,14 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    						dynamicForm.getFieldCode(), dynamicForm.getBlock(), dynamicForm.getGroupCode());
 	    				dynamicFormValue.setAppKey(appKey);
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					}
-    				
     			}
     		});
 
-    		return listfrom;
+    		return listfrom.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
     	}
     	
     	public List<SelectItem> getdata(Collection<DataDictionary> list) {