diff --git a/XFFruit/Controllers/HTTPController/ICRHTTPController.h b/XFFruit/Controllers/HTTPController/ICRHTTPController.h index df34da935ea158bad872eb0e206d80e1aabc9078..47d9bb66f9717392e977b42989e2ea533330f7a6 100644 --- a/XFFruit/Controllers/HTTPController/ICRHTTPController.h +++ b/XFFruit/Controllers/HTTPController/ICRHTTPController.h @@ -193,6 +193,9 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) { page_size:(NSUInteger)page_size success:(void (^)(id))succ failure:(void (^)(id))fail; +- (void)querySurveyWithBillData:(id)data + success:(void (^)(id))succ + failure:(void (^)(id))fail; //获å–è¡Œæƒ…è°ƒç ”å•å馈列表 - (void)getResultsWithSurveyUuid:(NSString *)surveyUuid success:(void (^)(id))succ diff --git a/XFFruit/Controllers/HTTPController/ICRHTTPController.m b/XFFruit/Controllers/HTTPController/ICRHTTPController.m index ba29d3a3ebcac66ad493e76be84c351e9d383e33..00a9ec3eda6965904a0ca553bc3e95998f7833bf 100644 --- a/XFFruit/Controllers/HTTPController/ICRHTTPController.m +++ b/XFFruit/Controllers/HTTPController/ICRHTTPController.m @@ -239,7 +239,7 @@ static NSString * const ICRAttachmentTypeValue[] = { { [requestSerializer setValue:user.orgId forHTTPHeaderField:@"enterprise"]; } -// [requestSerializer setValue:user.authorization forHTTPHeaderField:@"Authorization"]; +// [requestSerializer setValue:user. forHTTPHeaderField:@"Authorization"]; return requestSerializer; } @@ -1361,6 +1361,34 @@ acceptTypeJson:YES failure:failure]; } +- (void)querySurveyWithBillData:(id)data + success:(void (^)(id))succ + failure:(void (^)(id))fail{ + + void (^success)(AFHTTPRequestOperation *operation, id responseObject) = ^(AFHTTPRequestOperation *operation, id responseObject) { + CLog(@"%@", responseObject); + if (succ) { + succ( responseObject ); + } + }; + void (^failure)(AFHTTPRequestOperation *operation, NSError *error) = ^(AFHTTPRequestOperation *operation, NSError *error) { + CLog(@"%@", error); + if (fail) { + fail( error ); + } + }; + NSDictionary *dict = data; + NSString *urlStr = [[self class] UrlForPluginHTTPAction:XFFHttp_QuerySurvey]; + [self POST:urlStr + parameters:dict + needToken:NO +acceptTypeJson:YES + success:success + failure:failure]; +} + + + - (void)getResultsWithSurveyUuid:(NSString *)surveyUuid success:(void (^)(id))succ failure:(void (^)(id))fail{ @@ -1439,7 +1467,7 @@ acceptTypeJson:YES fail( error ); } }; - NSString *dateStr = @"2015-06-07"; + NSString *dateStr = @"2015-01-01"; NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_GetUser] stringByAppendingFormat:@"?start_date=%@&page_number=%@&page_size=%@", dateStr,@(page_number),@(page_size)]; NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; [self POST:encodeUrlStr diff --git a/XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m b/XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m index eaa439ff7f322ecaa072f1e1e8ff66e8e27c8cb6..07805f21cc0091e3ca821f50b1cc898cce8279e6 100644 --- a/XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m +++ b/XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m @@ -141,7 +141,7 @@ typedef enum : NSUInteger { NSString *message = data[@"message"]; if (success == 1) { //æˆåŠŸ - [IBTLoadingView showTips:@""]; + [IBTLoadingView showTips:@"æ“作æˆåŠŸ"]; }else{ [IBTLoadingView showTips:message]; diff --git a/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m b/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m index 49726da89b72293688cbe4790f0c0175a2b75d33..ed11f553b1acb31129e141649bd274049de6d865 100644 --- a/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m +++ b/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m @@ -52,7 +52,7 @@ typedef enum : NSUInteger { - (void)initData{ _dataArr = [NSMutableArray array]; - //ä¿å˜ + //查询 void(^succ)(id) = ^(id data) { [IBTLoadingView hideHUDWithText:nil]; NSLog(@"%@",data); @@ -62,7 +62,20 @@ typedef enum : NSUInteger { [IBTLoadingView showTips:data]; }; [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."]; - [[ICRHTTPController sharedController] querySurveyWithBillNUmberLinke:@"fdsfds" state:@"initial" titleLike:@"fds" orderFiled:@"fdsafds" orderDirection:@"asc" page_number:0 page_size:100 success:succ failure:fail]; +// [[ICRHTTPController sharedController] querySurveyWithBillNUmberLinke:@"fdsfds" state:@"initial" titleLike:@"fds" orderFiled:@"fdsafds" orderDirection:@"asc" page_number:0 page_size:100 success:succ failure:fail]; + ICRUserUtil *userUtil = [ICRUserUtil sharedInstance]; + NSDictionary *dict = @{ +// @"enterprise":@"402881894d3e4cca014d3e4cf7c2002a", +// @"userUuid":userUtil.userId, +// @"billNumberLike":@"150809", +// @"state":@"ee", +// @"titleLike":@"001", +// @"orderField":@"title", +// @"orderDirection":@"asc", + @"pageNumber":@(0), + @"pageSize":@(20)}; + [[ICRHTTPController sharedController] querySurveyWithBillData:dict success:succ failure:fail]; + // [[ICRHTTPController sharedController] getResultsWithSurveyUuid:@"111" success:succ failure:fail]; // for (NSInteger i = 0; i < 4; i++) {