Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathController.java

@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -198,7 +199,7 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
 
         }
 
-        return Result.OK(new ItdmRunFlowPathInfoVO(itdmRunFlowPath, vos));
+        return Result.OK(new ItdmRunFlowPathInfoVO(itdmRunFlowPath, vos.stream().sorted(Comparator.comparingInt(o -> Integer.parseInt(o.getSort()))).collect(Collectors.toList())));
     }
 
     /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/convert/FlowPathConvert.java

@@ -39,6 +39,7 @@ public interface FlowPathConvert {
     @Mapping(target = "isUpdate", source = "isUpdate")
     @Mapping(target = "dangqian", source = "dangqian")
     @Mapping(target = "itdmWeituoInfo", source = "itdmWeituoInfo")
+    @Mapping(target = "sort", source = "step.sort")
 
     ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate, Boolean dangqian, ItdmWeituoInfo itdmWeituoInfo);
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmRunFlowPathStepVO.java

@@ -35,6 +35,10 @@ public class ItdmRunFlowPathStepVO {
     @ApiModelProperty(value = "表单数据")
     private String saveData;
 
+    @ApiModelProperty(value = "顺序")
+
+    private String sort;
+
     private  Boolean isUpdate;
 
     private ItdmWeituoInfo itdmWeituoInfo;