Merge branch 'master' of

https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

Conflicts:
	tiku_App/TestData/DataAllWff.xls

tiku_App/src/com/offcn/api/tk/app3/getAbilitys.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 48.数据报告----能力图谱接口
+ * 
+ * @author puhui
+ *
+ */
+public class getAbilitys extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String is_position;//是否通过职位信息对比
+	public String user_position_id;//用户职位信息id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		is_position = MapUtil.getParameter(parameter, "is_position").trim();
+		user_position_id = MapUtil.getParameter(parameter, "user_position_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
+			user_position_id=L_position_id;
+			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getGrowths.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 54.数据报告----成长轨迹接口
+ * 
+ * @author puhui
+ *
+ */
+public class getGrowths extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String is_position;//是否通过职位信息对比
+	public String user_position_id;//用户职位信息id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		is_position = MapUtil.getParameter(parameter, "is_position").trim();
+		user_position_id = MapUtil.getParameter(parameter, "user_position_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
+			user_position_id=L_position_id;
+			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && jp.getString("data")!=null){
+				String custom=data.get("custom").toString();
+				String[] ArrayString=StringUtils.getArrayString(custom,",");
+				if(!StringUtils.VerificationString(jp.getString("data"),ArrayString)){
+					result = result && false;
+					failReason = failReason + "custom is expected "
+							+ data.get("custom").toString() + " but actually "
+							+ jp.getString("data") + ".";
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMockInfo.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 45.数据报告----模考追踪
+ * 
+ * @author puhui
+ *
+ */
+public class getMockInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String is_position;//是否通过职位信息对比
+	public String user_position_id;//用户职位id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		is_position = MapUtil.getParameter(parameter, "is_position").trim();
+		user_position_id = MapUtil.getParameter(parameter, "user_position_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
+			user_position_id=L_position_id;
+			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMockList_2.java → tiku_App/src/com/offcn/api/tk/app3/getMockList_web.java

@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
  * @author mr
  *
  */
-public class getMockList_2 extends TK implements API {
+public class getMockList_web extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String exam_id;//考试项目id

tiku_App/src/com/offcn/api/tk/app3/positioninfo.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 82.用户报考职位信息保存
+ * 
+ * @author puhui
+ *
+ */
+public class positioninfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String office_id;//招录机关id
+	public String department_id;//用人司局id
+	public String position_id;//报考职位id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		office_id = MapUtil.getParameter(parameter, "office_id").trim();
+		department_id = MapUtil.getParameter(parameter, "department_id").trim();
+		position_id = MapUtil.getParameter(parameter, "position_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!office_id.equals("")) && office_id.equals("code")) {
+			office_id=L_office_id;
+			parameter = parameter.replace("\"office_id\":code", "\"office_id\":\""+ office_id + "\"");
+		}
+		if ((!department_id.equals("")) && department_id.equals("code")) {
+			department_id=L_department_id;
+			parameter = parameter.replace("\"department_id\":code", "\"department_id\":\""+ department_id + "\"");
+		}
+		if ((!position_id.equals("")) && position_id.equals("code")) {
+			position_id=L_position_id;
+			parameter = parameter.replace("\"position_id\":code", "\"position_id\":\""+ position_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("数据库添加成功".equals(msg)){
+				position_id = MapUtil.killQuotes(position_id, "\"");
+				L_position_id=position_id;
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/releaseScoreToStudent.java

@@ -60,6 +60,15 @@ public class releaseScoreToStudent extends TK implements API {
 			
 				
 			record_id =rs_bankcard.getString("use_id");	
+			
+			parameter = MapUtil.getValue("parameter", data);
+			record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
+			
+			if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
+				
+				nwn_record_id = record_id;	
+			}
+			
 					
 		} catch (Exception e) {
 			
@@ -74,9 +83,12 @@ public class releaseScoreToStudent extends TK implements API {
 		parameter = MapUtil.getValue("parameter", data);
 		record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
 		
+				
 		if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
-		
-			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+			
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":"+ record_id );
+		}else {
+			parameter = parameter.replace("\"record_id\":old", "\"record_id\":"+ nwn_record_id );
 		}
 		data.put("parameter", parameter);
 		return data;
@@ -93,8 +105,15 @@ public class releaseScoreToStudent extends TK implements API {
 		parameter = MapUtil.getValue("parameter", data);
 		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
 		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
+		
 		
-		jsonAsMap.put("record_id", record_id);
+		if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
+			
+			jsonAsMap.put("record_id", record_id);
+		}else {
+			jsonAsMap.put("record_id", nwn_record_id);
+		}
 		jsonAsMap.put("appid", tikuString);
 		
 		MyRequest myRequest=new MyRequest();

tiku_App/src/com/offcn/process/TK.java

@@ -74,6 +74,7 @@ public class TK extends BasicsGM{
 	public static String nwn_record_id="";//nwn使用的   试卷使用记录id
 	public static String L_office_id="";//招录机关id
 	public static String L_department_id="";//用人司局id
+	public static String L_position_id="";//职位id
 	
 	
 	

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -35,7 +35,7 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMakeWff.xls","Sheet1","post","tk_3");
+		make("TestData/CaseMakeMr.xls","Sheet1","post","tk_3");
 	}
 	
 	
@@ -319,7 +319,7 @@ public class MakeTestCases {
 //		System.out.println(nameList);
 		
 		for(int i=0;i<MakeTestCases.state;i++){
-			List<Set<String>> a=TestCase_N("TestData/CaseMakeWff.xls",SheetList.get(i),nameList.get(i));
+			List<Set<String>> a=TestCase_N("TestData/CaseMakeMr.xls",SheetList.get(i),nameList.get(i));
 			listt.add(a.get(0));
 			listf.add(a.get(1));
 		}	

tiku_App/src/resources/test.properties

-xls=DataAllWff.xls
-sheet=TestCase
+xls=DataAll.xls
+sheet=IIP
 mysql_local_Online=local
 Percentage=60
\ No newline at end of file