|
@@ -217,6 +217,14 @@ public class TemplateGenerator {
|
|
|
|
|
|
private static List<ParaVo> getAllParaVos(String pid) {
|
|
|
List<ParaVo> paravos =new ArrayList<>();
|
|
|
+
|
|
|
+ paravos.addAll(findMathFuncInMySelfParaVos(pid));//自建 MathFunc in
|
|
|
+ //in param
|
|
|
+ List<ParaVo> inPlist = getInParaVos(pid);
|
|
|
+ paravos.addAll(inPlist);
|
|
|
+ //mathfunc 自动流转变量
|
|
|
+ List<ParaVo> mathfuncInPram = getMathFuncZdlz(pid);
|
|
|
+ paravos.addAll(mathfuncInPram);
|
|
|
List<String> allUid = findAllOutUids(pid);// 可修改变量
|
|
|
for (String uid:allUid) {
|
|
|
ParaVo pvo =new ParaVo();
|
|
@@ -224,13 +232,10 @@ public class TemplateGenerator {
|
|
|
pvo.setLable(uid.substring(uid.lastIndexOf("/")+1,uid.length()));
|
|
|
paravos.add(pvo);
|
|
|
}
|
|
|
- //mathfunc 自动流转变量
|
|
|
- List<ParaVo> mathfuncInPram = getMathFuncZdlz(pid);
|
|
|
- paravos.addAll(mathfuncInPram);
|
|
|
- paravos.addAll(findMathFuncInMySelfParaVos(pid));//自建 MathFunc in
|
|
|
- //in param
|
|
|
- List<ParaVo> inPlist = getInParaVos(pid);
|
|
|
- paravos.addAll(inPlist);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return paravos;
|
|
|
}
|
|
|
private static List<ParaVo> getMathFuncZdlz(String pid){
|