流设置添加2种新类型

src/main/java/com/miniframe/bisiness/mdo/MDO0052Service.java

@@ -43,13 +43,13 @@ public class MDO0052Service extends MDO0052BaseModel implements ExecProcessFlow
 			row.setSteamflag(p.getSteamflag()==null?1:p.getSteamflag());
 			row.setSteamtype(p.getSteamtype()==null?1:p.getSteamtype());
 			if(2==type){//求解组件到优化组件 排除求解组件到求解组件已设置的数据
-				if(p.getSteamtype()!=null&&p.getSteamtype().equals("3")){
+				if(p.getSteamtype()!=null&&p.getSteamtype()==3){
 					continue;
 				}
 			}else if(3==type){//求解组件到求解组件 排除求解组件到优化组件已设置的数据
 				if(p.getSteamtype()!=null
-						&&(p.getSteamtype().equals("1")||p.getSteamtype().equals("2")
-						)){
+						&&(p.getSteamtype()==1||p.getSteamtype()==2)
+						){
 					continue;
 				}
 			}

src/main/java/com/miniframe/bisiness/mdo/MDO0074Service.java

@@ -39,10 +39,12 @@ public class MDO0074Service extends MDO0074BaseModel implements ExecProcessFlow
 			String streamflag = pt[1];
 			MdoProInoutPara para = pdao.selectByPrimaryKey(paramid);
 			if(para!=null){//只修改选中的
-				para.setSteamflag(Integer.valueOf(streamflag));
-				para.setSteamtype(3);
-				pdao.updateByPrimaryKey(para);
+
 				if(streamflag.equals("1")){
+					para.setSteamflag(Integer.valueOf(streamflag));
+					para.setSteamtype(3);
+					pdao.updateByPrimaryKey(para);
+
 					//选中的添加到 目标组件来源数据中
 					MdoProInoutPara tPara = new MdoProInoutPara();
 					tPara.setId(UtilTools.getUUid());
@@ -54,6 +56,10 @@ public class MDO0074Service extends MDO0074BaseModel implements ExecProcessFlow
 					tPara.setType(1);
 					tPara.setComtype(Integer.valueOf(tcomtype));
 					pdao.insert(tPara);
+				}else {
+					para.setSteamflag(Integer.valueOf(streamflag));
+					para.setSteamtype(null);//还原
+					pdao.updateByPrimaryKey(para);
 				}
 			}