|  | @@ -228,16 +228,15 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |          return paravos;
 |  |          return paravos;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |      private static List<ParaVo> getMathFuncZdlz(String pid){
 |  |      private static List<ParaVo> getMathFuncZdlz(String pid){
 | 
											
												
													
														|  | -        List<ParaVo> mathfuncInPram = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | 
 |  | +        List<ParaVo> mathfuncInPrams = new ArrayList<>();
 | 
											
												
													
														|  |          MdoProInoutParaMapper dao = UtilTools.getBean(MdoProInoutParaMapper.class);
 |  |          MdoProInoutParaMapper dao = UtilTools.getBean(MdoProInoutParaMapper.class);
 | 
											
												
													
														|  |          MdoProInoutParaSQLBuilder sb = new MdoProInoutParaSQLBuilder();
 |  |          MdoProInoutParaSQLBuilder sb = new MdoProInoutParaSQLBuilder();
 | 
											
												
													
														|  |          MdoProInoutParaSQLBuilder.Criteria sc = sb.createCriteria();
 |  |          MdoProInoutParaSQLBuilder.Criteria sc = sb.createCriteria();
 | 
											
												
													
														|  |          sc.andPidEqualTo(pid);
 |  |          sc.andPidEqualTo(pid);
 | 
											
												
													
														|  | -        sc.andComtypeEqualTo(Integer.valueOf(ComType.MathFunc.getIndex()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +        sc.andComtypeEqualTo(Integer.valueOf(ComType.MathFunc.getIndex()));//match
 | 
											
												
													
														|  |          sc.andFlagEqualTo(1);//启用
 |  |          sc.andFlagEqualTo(1);//启用
 | 
											
												
													
														|  |          sc.andTypeEqualTo(1);//输入参数
 |  |          sc.andTypeEqualTo(1);//输入参数
 | 
											
												
													
														|  |          sc.andFcomidIsNotNull();//非自建
 |  |          sc.andFcomidIsNotNull();//非自建
 | 
											
												
													
														|  | -        sc.andComtypeEqualTo(Integer.valueOf(ComType.MathFunc.getIndex()));//match
 |  | 
 | 
											
												
													
														|  |          List<MdoProInoutPara> paras = dao.selectByExample(sb);
 |  |          List<MdoProInoutPara> paras = dao.selectByExample(sb);
 | 
											
												
													
														|  |          for (MdoProInoutPara para:paras) {
 |  |          for (MdoProInoutPara para:paras) {
 | 
											
												
													
														|  |              ParaVo vo = new ParaVo();
 |  |              ParaVo vo = new ParaVo();
 | 
											
										
											
												
													
														|  | @@ -245,9 +244,9 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |              uid =MdoUidUtils.getUidByComTyeAndPcode(para.getComtype().toString(),para.getCode());
 |  |              uid =MdoUidUtils.getUidByComTyeAndPcode(para.getComtype().toString(),para.getCode());
 | 
											
												
													
														|  |              vo.setUid(uid);
 |  |              vo.setUid(uid);
 | 
											
												
													
														|  |              vo.setLable(para.getCode());
 |  |              vo.setLable(para.getCode());
 | 
											
												
													
														|  | -            mathfuncInPram.add(vo);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            mathfuncInPrams.add(vo);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        return  mathfuncInPram;
 |  | 
 | 
											
												
													
														|  | 
 |  | +        return  mathfuncInPrams;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |      private static List<ParaVo> getInParaVos(String pid) {
 |  |      private static List<ParaVo> getInParaVos(String pid) {
 | 
											
												
													
														|  |          MdoProjectVariateMapper vDao =UtilTools.getBean(MdoProjectVariateMapper.class);
 |  |          MdoProjectVariateMapper vDao =UtilTools.getBean(MdoProjectVariateMapper.class);
 | 
											
										
											
												
													
														|  | @@ -388,7 +387,7 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |          //自动流转变量
 |  |          //自动流转变量
 | 
											
												
													
														|  |          List<ParaVo> mathfuncInPrams = getMathFuncZdlz(pid);
 |  |          List<ParaVo> mathfuncInPrams = getMathFuncZdlz(pid);
 | 
											
												
													
														|  |          for (ParaVo vo:mathfuncInPrams) {
 |  |          for (ParaVo vo:mathfuncInPrams) {
 | 
											
												
													
														|  | -            ouids.add(vo.getUid());
 |  | 
 | 
											
												
													
														|  | 
 |  | +            outUids.add(vo.getUid());
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          return  outUids;
 |  |          return  outUids;
 | 
											
												
													
														|  |      }
 |  |      }
 |