修改了redStarUrl

redstar.xcodeproj/project.pbxproj

@@ -112,6 +112,8 @@
 		84CC34E21C09583D002F10E2 /* LookOnLineTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CC34E11C09583D002F10E2 /* LookOnLineTableViewCell.m */; };
 		84CC34EC1C09AD98002F10E2 /* LookOnLineDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CC34EB1C09AD98002F10E2 /* LookOnLineDetailView.m */; };
 		84CC34EF1C09AEC0002F10E2 /* LookOnLineDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CC34EE1C09AEC0002F10E2 /* LookOnLineDetailViewController.m */; };
+		84CEB1671C28E8970072ED0A /* SpotCheckModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CEB1661C28E8970072ED0A /* SpotCheckModel.m */; };
+		84CEB16B1C28F0E20072ED0A /* LookOnLineModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CEB16A1C28F0E20072ED0A /* LookOnLineModel.m */; };
 		84CF0F1E1BE9B40400C855CE /* InspectDetailFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CF0F1D1BE9B40400C855CE /* InspectDetailFooterView.m */; };
 		84CF0FA21BE9EDA900C855CE /* TakePhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84CF0FA11BE9EDA900C855CE /* TakePhotoView.m */; };
 		84D3E5F01C04BC8C001FF1DD /* InspectUploadedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84D3E5EF1C04BC8C001FF1DD /* InspectUploadedViewController.m */; };
@@ -383,6 +385,10 @@
 		84CC34EB1C09AD98002F10E2 /* LookOnLineDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LookOnLineDetailView.m; sourceTree = "<group>"; };
 		84CC34ED1C09AEC0002F10E2 /* LookOnLineDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookOnLineDetailViewController.h; sourceTree = "<group>"; };
 		84CC34EE1C09AEC0002F10E2 /* LookOnLineDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LookOnLineDetailViewController.m; sourceTree = "<group>"; };
+		84CEB1651C28E8970072ED0A /* SpotCheckModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpotCheckModel.h; sourceTree = "<group>"; };
+		84CEB1661C28E8970072ED0A /* SpotCheckModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpotCheckModel.m; sourceTree = "<group>"; };
+		84CEB1691C28F0E20072ED0A /* LookOnLineModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookOnLineModel.h; sourceTree = "<group>"; };
+		84CEB16A1C28F0E20072ED0A /* LookOnLineModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LookOnLineModel.m; sourceTree = "<group>"; };
 		84CF0F1C1BE9B40400C855CE /* InspectDetailFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectDetailFooterView.h; sourceTree = "<group>"; };
 		84CF0F1D1BE9B40400C855CE /* InspectDetailFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectDetailFooterView.m; sourceTree = "<group>"; };
 		84CF0FA01BE9EDA900C855CE /* TakePhotoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TakePhotoView.h; sourceTree = "<group>"; };
@@ -740,6 +746,7 @@
 		843D1B991C0B3F6200E30002 /* SpotCheckOnLine */ = {
 			isa = PBXGroup;
 			children = (
+				84CEB1641C28E7E40072ED0A /* Model */,
 				843D1B9A1C0B3F6200E30002 /* View */,
 				843D1B9B1C0B3F6200E30002 /* ViewController */,
 			);
@@ -1640,6 +1647,7 @@
 		84CC34C81C093C2F002F10E2 /* LookOnLine */ = {
 			isa = PBXGroup;
 			children = (
+				84CEB1681C28F0B50072ED0A /* Model */,
 				84CC34C91C093C2F002F10E2 /* Cell */,
 				84CC34CA1C093C2F002F10E2 /* View */,
 				84CC34CB1C093C2F002F10E2 /* ViewController */,
@@ -1751,6 +1759,24 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
+		84CEB1641C28E7E40072ED0A /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				84CEB1651C28E8970072ED0A /* SpotCheckModel.h */,
+				84CEB1661C28E8970072ED0A /* SpotCheckModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		84CEB1681C28F0B50072ED0A /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				84CEB1691C28F0E20072ED0A /* LookOnLineModel.h */,
+				84CEB16A1C28F0E20072ED0A /* LookOnLineModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		84CF0ECA1BE9A7EF00C855CE /* InspectDetail */ = {
 			isa = PBXGroup;
 			children = (
@@ -2167,6 +2193,7 @@
 				841D24FB1BEB75CA0005CC9F /* QuestionDetailFooterView.m in Sources */,
 				84CF0FA21BE9EDA900C855CE /* TakePhotoView.m in Sources */,
 				846206BB1C06AFF50015C456 /* RankCommentCell.m in Sources */,
+				84CEB16B1C28F0E20072ED0A /* LookOnLineModel.m in Sources */,
 				849B2F741C0CA60E005D809F /* AnnounceDetailFootView.m in Sources */,
 				841D24F81BEB473C0005CC9F /* CheckPicViewController.m in Sources */,
 				84D80EB61BF714BE00A10EA4 /* GroupTabBar.m in Sources */,
@@ -2175,6 +2202,7 @@
 				84720BC11C0377D300314099 /* CommentWithStarView.m in Sources */,
 				846206B81C06AFCA0015C456 /* RankCommentModel.m in Sources */,
 				84A6738E1C0BE2D0000F828E /* OnLineCompleteCell.m in Sources */,
+				84CEB1671C28E8970072ED0A /* SpotCheckModel.m in Sources */,
 				84CC34D41C094476002F10E2 /* StandardViewController.m in Sources */,
 				84FD8A0A1BDA01D1006E442A /* MineViewController.m in Sources */,
 				84C972991C1ADB9C003A3276 /* PictureDetailTableCell.m in Sources */,

redstar/Classes/Macro/Url.h

@@ -10,7 +10,12 @@
 #define Url_h
 
 // url
-#define kRedStarURL  @"http://218.244.151.129:7580/"
+//#define kRedStarURL  @"http://218.244.151.129:7580/"
+
+
+
+#define kRedStarURL  @"http://172.16.3.12:7580/"
+
 
 // 检查更新
 #define kCheckUpdateURL @"redstar-server/rest/ipapk?type=ipa"
@@ -56,10 +61,10 @@
 #define kAnnounceYetReadURL @"redstar-server/rest/affiche/read/"
 
 // 管理层的抽查列表
-#define kManageSportcheckURL @"redstar-server/rest/sportcheck/query"
+#define kManageSportcheckURL @"redstar-server/rest/spotcheck/query"
 
 // 商场的抽查列表
-#define kStoreSportcheckURL @"redstar-server/rest/sportcheck/query_store"
+#define kStoreSportcheckURL @"redstar-server/rest/spotcheck/query_store"
 
 // 发起抽查
 #define kSaveSportcheckURL @"redstar-server/rest/spotcheck/save?time="

redstar/Classes/Module/Function/OnLine/LookOnLine/Cell/LookOnLineTableViewCell.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "LookOnLineModel.h"
 
 @interface LookOnLineTableViewCell : UITableViewCell
 @property (nonatomic, strong) UILabel *titleLabel; // 标题
@@ -15,4 +16,6 @@
 @property (nonatomic, strong) UILabel *overDate; // 截止日期
 @property (nonatomic, strong) UILabel *progressLabel; // 进度
 
+@property (nonatomic, strong) LookOnLineModel *lookOnLine; // 进度
+
 @end

redstar/Classes/Module/Function/OnLine/LookOnLine/Cell/LookOnLineTableViewCell.m

@@ -10,6 +10,41 @@
 
 @implementation LookOnLineTableViewCell
 
+- (void)setLookOnLine:(LookOnLineModel *)lookOnLine
+{
+    _lookOnLine = lookOnLine;
+    self.titleLabel.text = [NSString stringWithFormat:@"%@", lookOnLine.title];
+    //self.peopleLabel.text = [NSString stringWithFormat:@"发起人：%@", lookOnLine.]
+    self.peopleLabel.text = @"发起人：王XX 集团XX总";
+    self.startDate.text = [NSString stringWithFormat:@"发起时间：%@", lookOnLine.reportTime];
+    self.overDate.text = [NSString stringWithFormat:@"截止时间：%@", lookOnLine.endDate];
+    self.progressLabel.text = @"临检进度：进行中";
+    
+    if ([lookOnLine.state isEqualToString:@"initial"]) {
+        NSString *str = [NSString stringWithFormat:@"临检进度：未处理"];
+        NSMutableAttributedString *strAttr = [[NSMutableAttributedString alloc] initWithString:str];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kCellDetailColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(0,5)];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kProgressUnSettledColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(5,str.length - 5)];
+        [self.progressLabel setAttributedText:strAttr];
+    } else if ([lookOnLine.state isEqualToString:@"reported"]) {
+        NSString *str = [NSString stringWithFormat:@"临检进度：已上报"];
+        NSMutableAttributedString *strAttr = [[NSMutableAttributedString alloc] initWithString:str];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kCellDetailColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(0,5)];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kProgressDealWithColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(5,str.length - 5)];
+        [self.progressLabel setAttributedText:strAttr];
+    } else if ([lookOnLine.state isEqualToString:@"finished"]) {
+        NSString *str = [NSString stringWithFormat:@"临检进度：已评分"];
+        NSMutableAttributedString *strAttr = [[NSMutableAttributedString alloc] initWithString:str];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kCellDetailColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(0,5)];
+        [strAttr addAttributes:@{NSForegroundColorAttributeName:kProgressDealWithColor,NSFontAttributeName:[UIFont systemFontOfSize:14.0f]} range:NSMakeRange(5,str.length - 5)];
+        [self.progressLabel setAttributedText:strAttr];
+    } else {
+        NSString *str = [NSString stringWithFormat:@"临检进度："];
+        self.progressLabel.text = str;
+    }
+}
+
+
 #pragma mark - lazy Loading
 - (UILabel *)titleLabel
 {

redstar/Classes/Module/Function/OnLine/LookOnLine/Model/LookOnLineModel.h

+//
+//  LookOnLineModel.h
+//  redstar
+//
+//  Created by admin on 15/12/22.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface LookOnLineModel : NSObject
+@property (nonatomic, copy) NSString *attachmentId;
+@property (nonatomic, strong) NSArray *attachments;
+@property (nonatomic, copy) NSString *commentId;
+@property (nonatomic, strong) NSArray *comments;
+@property (nonatomic, copy) NSString *content;
+@property (nonatomic, copy) NSString *endDate;
+@property (nonatomic, copy) NSString *processNote;
+@property (nonatomic, copy) NSString *reportTime;
+@property (nonatomic, copy) NSString *score;
+@property (nonatomic, copy) NSString *state;
+@property (nonatomic, copy) NSString *storeAddress;
+@property (nonatomic, copy) NSString *storePath;
+@property (nonatomic, strong) NSArray *storePictures;
+@property (nonatomic, copy) NSString *store_code;
+@property (nonatomic, copy) NSString *store_name;
+@property (nonatomic, copy) NSString *store_uuid;
+@property (nonatomic, copy) NSString *title;
+
+@end

redstar/Classes/Module/Function/OnLine/LookOnLine/Model/LookOnLineModel.m

+//
+//  LookOnLineModel.m
+//  redstar
+//
+//  Created by admin on 15/12/22.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import "LookOnLineModel.h"
+
+@implementation LookOnLineModel
+
+@end

redstar/Classes/Module/Function/OnLine/LookOnLine/ViewController/LookOnLineViewController.m

@@ -19,6 +19,8 @@
 #import <MJRefresh.h>
 #import "NoDataView.h"
 
+#import "LookOnLineModel.h"
+
 #define kLookOnLineCell @"LookOnLineTableViewCell"
 
 @interface LookOnLineViewController ()<UITableViewDelegate, UITableViewDataSource,ScreenTableDelegate, TaxisViewDelegate, InspectTableViewDelegate>
@@ -103,7 +105,7 @@
     HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
     // 相关参数
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
-    NSDictionary *parameters = @{@"user":user_uuid,
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
                                  @"pageNumber":@(0),
                                  @"pageSize":@(10)
                                  };
@@ -111,27 +113,36 @@
     [http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
         NSLog(@"获取 商场 抽查列表 response= %@", response);
         NSLog(@"获取 商场 抽查列表 error= %@", error);
-        
-//        if (_allLookOnLineList.count == 0) {
-//            if (_tableView) {
-//                [_tableView removeFromSuperview];
-//                _tableView = nil;
-//            }
-//            self.noDataView.backgroundColor = [UIColor whiteColor];
-//
-//        } else {
-//            if (_noDataView) {
-//                [_noDataView removeFromSuperview];
-//                _noDataView = nil;
-//            }
-//            self.tableView.delegate = self;
-//            self.tableView.dataSource = self;
-//            // 下拉加载更多
-//        self.tableView.footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-//            [self requestMoreList];
-//        }];
-//            [self.tableView reloadData];
-//        }
+        NSDictionary *dataDict = response[@"data"];
+        NSArray *recordsArray = dataDict[@"records"];
+        NSMutableArray *tempArray = [NSMutableArray array];
+        
+        for (NSDictionary *dict in recordsArray) {
+            LookOnLineModel *lookOnline = [[LookOnLineModel alloc] init];
+            [lookOnline setValuesForKeysWithDictionary:dict];
+            [tempArray addObject:lookOnline];
+        }
+        [_allLookOnLineList addObjectsFromArray:tempArray];
+        if (_allLookOnLineList.count == 0) {
+            if (_tableView) {
+                [_tableView removeFromSuperview];
+                _tableView = nil;
+            }
+            self.noDataView.backgroundColor = [UIColor whiteColor];
+            
+        } else {
+            if (_noDataView) {
+                [_noDataView removeFromSuperview];
+                _noDataView = nil;
+            }
+            self.tableView.delegate = self;
+            self.tableView.dataSource = self;
+            // 下拉加载更多
+            self.tableView.footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+                [self requestMoreList];
+            }];
+            [self.tableView reloadData];
+        }
         
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         self.menuView.backgroundColor = kInspectSectionBackGroundColor;
@@ -144,7 +155,7 @@
     HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
     // 相关参数
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
-    NSDictionary *parameters = @{@"user":user_uuid,
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
                                  @"pageNumber":@(_page),
                                  @"pageSize":@(10)
                                  };
@@ -152,6 +163,23 @@
     [http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
         NSLog(@"上拉加载获取 更多 商场 抽查列表 response= %@", response);
         NSLog(@"上拉加载获取 更多 商场 抽查列表 error= %@", error);
+        NSDictionary *dataDict = response[@"data"];
+        NSArray *recordsArray = dataDict[@"records"];
+        NSMutableArray *tempArray = [NSMutableArray array];
+        for (NSDictionary *dict in recordsArray) {
+            LookOnLineModel *lookOnline = [[LookOnLineModel alloc] init];
+            [lookOnline setValuesForKeysWithDictionary:dict];
+            [tempArray addObject:lookOnline];
+        }
+        [_allLookOnLineList addObjectsFromArray:tempArray];
+        if (tempArray.count < 10) {
+            [self.tableView.footer noticeNoMoreData];
+        } else {
+            [self.tableView.footer endRefreshing];
+        }
+        [self.tableView reloadData];
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+
     }];
 }
 
@@ -443,7 +471,7 @@
 #pragma mark - UITableView Delegate/DataSource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 10;
+    return _allLookOnLineList.count;
 }
 
 // cell显示的内容
@@ -453,20 +481,17 @@
     if (!cell) {
         cell = [[LookOnLineTableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kLookOnLineCell];
     }
-    cell.titleLabel.text = @"2015年十一促销临时抽查";
-    cell.peopleLabel.text = @"发起人：王XX 集团XX总";
-    cell.startDate.text = @"发起时间：2015-09-30 12:23:11";
-    cell.overDate.text = @"截止时间：2015-10-05";
-    cell.progressLabel.text = @"临检进度：进行中";
+    cell.lookOnLine = _allLookOnLineList[indexPath.row];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    
     return cell;
 }
 
 // cell的点击事件
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    LookOnLineModel *lookOnLine = _allLookOnLineList[indexPath.row];
     LookOnLineDetailViewController *lookDetailVC = [[LookOnLineDetailViewController alloc] init];
+    lookDetailVC.uuid = lookOnLine.attachmentId;
     [self.navigationController pushViewController:lookDetailVC animated:YES];
 }
 

redstar/Classes/Module/Function/OnLine/LookOnLineDetail/ViewController/LookOnLineDetailViewController.h

@@ -9,5 +9,5 @@
 #import <UIKit/UIKit.h>
 
 @interface LookOnLineDetailViewController : UIViewController
-
+@property (nonatomic, copy) NSString *uuid;
 @end

redstar/Classes/Module/Function/OnLine/LookOnLineDetail/ViewController/LookOnLineDetailViewController.m

@@ -44,6 +44,8 @@
     self.tableView.dataSource = self;
     
     self.imageNameArray = [NSMutableArray array];
+    
+    [self requestOnLineDetail];
     _rowNumber = 1;
 }
 
@@ -73,6 +75,18 @@
     self.navigationItem.titleView = customLab;
 }
 
+- (void)requestOnLineDetail
+{
+    NSString *url = [NSString stringWithFormat:@"%@%@%@?fetch_parts=stores", kRedStarURL, kSportcheckDetailURL,self.uuid];
+    url = [url stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+    HttpClient *httpClient= [[HttpClient alloc] initWithUrl:url];
+   
+    [httpClient getSportCheckDetailWithCompletion:^(id response, NSError *error) {
+        NSLog(@"5.4 抽查明细   response = %@, error = %@", response, error);
+    }];
+
+}
+
 - (void)reportRestult:(UIButton *)sender
 {
     // 提示框

redstar/Classes/Module/Function/OnLine/SpotCheckOnLine/Model/SpotCheckModel.h

+//
+//  SpotCheckModel.h
+//  redstar
+//
+//  Created by admin on 15/12/22.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface SpotCheckModel : NSObject
+@property (nonatomic, copy) NSString *content;
+@property (nonatomic, copy) NSString *create_id;
+@property (nonatomic, copy) NSString *create_operName;
+@property (nonatomic, copy) NSString *create_time;
+@property (nonatomic, copy) NSString *endDate;
+@property (nonatomic, copy) NSString *enterprise;
+@property (nonatomic, copy) NSString *finishCount;
+@property (nonatomic, copy) NSString *lastModify_id;
+@property (nonatomic, copy) NSString *lastModify_operName;
+@property (nonatomic, copy) NSString *lastModify_time;
+@property (nonatomic, copy) NSString *reportCount;
+@property (nonatomic, copy) NSString *state;
+@property (nonatomic, copy) NSString *storeCount;
+@property (nonatomic, strong) NSArray *stores;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *uuid;
+@property (nonatomic, copy) NSString *version;
+
+@end

redstar/Classes/Module/Function/OnLine/SpotCheckOnLine/Model/SpotCheckModel.m

+//
+//  SpotCheckModel.m
+//  redstar
+//
+//  Created by admin on 15/12/22.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import "SpotCheckModel.h"
+
+@implementation SpotCheckModel
+
+@end

redstar/Classes/Module/Function/OnLine/SpotCheckOnLine/ViewController/SpotCheckOnLineViewController.m

@@ -19,6 +19,7 @@
 #import "NoDataView.h"
 
 #import "InspectListCell.h"
+#import "SpotCheckModel.h"
 #define kInspectListTableViewcellIndeterfor @"inspectListTableViewcellIndeterfor"
 @interface SpotCheckOnLineViewController ()<UITableViewDelegate, UITableViewDataSource,ScreenTableDelegate, TaxisViewDelegate, InspectTableViewDelegate>
 @property (nonatomic, strong) MenuView *menuView;
@@ -116,29 +117,37 @@
     [http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
         NSLog(@"管理层的抽查列表 response= %@", response);
         NSLog(@"管理层的抽查列表 error= %@", error);
-        
-        
+        NSDictionary *dataDict = response[@"data"];
+        NSArray *recordsArray = dataDict[@"records"];
+        NSMutableArray *tempArray = [NSMutableArray array];
+
+        for (NSDictionary *dict in recordsArray) {
+            SpotCheckModel *spot = [[SpotCheckModel alloc] init];
+            [spot setValuesForKeysWithDictionary:dict];
+            [tempArray addObject:spot];
+        }
+        [_allSpotCheckList addObjectsFromArray:tempArray];
       
-//        if (_allSpotCheckList.count == 0) {
-//            if (_tableView) {
-//                [_tableView removeFromSuperview];
-//                _tableView = nil;
-//            }
-//            self.noDataView.backgroundColor = [UIColor whiteColor];
-//            
-//        } else {
-//            if (_noDataView) {
-//                [_noDataView removeFromSuperview];
-//                _noDataView = nil;
-//            }
-//            self.tableView.delegate = self;
-//            self.tableView.dataSource = self;
-//            // 下拉加载更多
-//        self.tableView.footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-//            [self requestMoreList];
-//        }];
-//            [self.tableView reloadData];
-//        }
+        if (_allSpotCheckList.count == 0) {
+            if (_tableView) {
+                [_tableView removeFromSuperview];
+                _tableView = nil;
+            }
+            self.noDataView.backgroundColor = [UIColor whiteColor];
+            
+        } else {
+            if (_noDataView) {
+                [_noDataView removeFromSuperview];
+                _noDataView = nil;
+            }
+            self.tableView.delegate = self;
+            self.tableView.dataSource = self;
+            // 下拉加载更多
+        self.tableView.footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            [self requestMoreList];
+        }];
+            [self.tableView reloadData];
+        }
         
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         self.menuView.backgroundColor = kInspectSectionBackGroundColor;
@@ -152,13 +161,28 @@
     // 相关参数
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
     NSDictionary *parameters = @{@"userUuid":user_uuid,
-                                 @"pageNumber":@(0),
+                                 @"pageNumber":@(_page),
                                  @"pageSize":@(10)
                                  };
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
         NSLog(@"上拉加载更多  管理层抽查列表 response= %@", response);
         NSLog(@"上拉加载更多  管理层抽查列表 error= %@", error);
+        NSDictionary *dataDict = response[@"data"];
+        NSArray *recordsArray = dataDict[@"records"];
+        NSMutableArray *tempArray = [NSMutableArray array];
+        for (NSDictionary *dict in recordsArray) {
+            SpotCheckModel *spot = [[SpotCheckModel alloc] init];
+            [spot setValuesForKeysWithDictionary:dict];
+            [tempArray addObject:spot];
+        }
+        [_allSpotCheckList addObjectsFromArray:tempArray];
+        if (tempArray.count < 10) {
+            [self.tableView.footer noticeNoMoreData];
+        } else {
+            [self.tableView.footer endRefreshing];
+        }
+        [self.tableView reloadData];
     }];
 }