Commit 9abe307e by xuyamei

接口修改优化

parent e7678c86
...@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"}; String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"};
String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"}; String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1887314841778122754");
boolean success = false; boolean success = false;
for (int i = 0; i < getPageByStudio.size(); i++) { for (int i = 0; i < getPageByStudio.size(); i++) {
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) { if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) {
...@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假", priority = 1) @Test(description = "训练营请假", priority = 1)
public void testTrainingSign_Leave() { public void testTrainingSign_Leave() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -204,7 +204,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -204,7 +204,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假补签到", priority = 2) @Test(description = "训练营请假补签到", priority = 2)
public void testTrainingSign_SIGNED() { public void testTrainingSign_SIGNED() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -259,7 +259,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -259,7 +259,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -294,7 +294,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -294,7 +294,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假标记已补", priority = 3) @Test(description = "训练营请假标记已补", priority = 3)
public void testTrainingSign_MARK_REMEDIAL() { public void testTrainingSign_MARK_REMEDIAL() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -354,7 +354,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -354,7 +354,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -388,7 +388,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -388,7 +388,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假无需补课", priority = 3) @Test(description = "训练营请假无需补课", priority = 3)
public void testTrainingSign_NEED_NOT_REMEDIAL() { public void testTrainingSign_NEED_NOT_REMEDIAL() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -448,7 +448,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -448,7 +448,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment