在线抽查 筛选框逻辑完成

redstar/Classes/Macro/Constant.h

@@ -141,6 +141,7 @@
 #define kRefreshInspectPointNotification @"refreshInspectPoint"
 #define kRefreshQuestionNotification @"refershQuestionList"
 
+#define kTAxisBtnTag 500232
 
 #import "UIView+Extension.h"
 

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

@@ -225,6 +225,7 @@
     }
     if (!_taxisView) {
         _taxisView = [[TaxisView alloc] init];
+        _taxisView.tag = 3928342;
         _taxisView.backgroundColor = [UIColor whiteColor];
     }
     
@@ -268,7 +269,7 @@
         [_bgView addGestureRecognizer:tapGR];
     }
     if (!_screenView) {
-        _screenView = [[ScreenView alloc] initWithTitleArray:[NSArray arrayWithObjects:@"待解决", @"已解决",@"已作废",nil]];
+        _screenView = [[ScreenView alloc] initWithTitleArray:[NSArray arrayWithObjects:@"全部",@"未处理", @"已处理",@"已完成",nil]];
         _screenView.delegate = self;
         _screenView.inspectTableView.inspectDelegate = self;
         _screenView.backgroundColor = [UIColor whiteColor];
@@ -322,9 +323,123 @@
 // 提交按钮
 - (void)submitClick:(UIButton *)sender
 {
+    HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
+    NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                       [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid",
+                                       @[],@"queryOrders",
+                                       @(0),@"pageNumber",
+                                       @(10),@"pageSize", nil];
     
+    if (_screenView.groupTabBar.selectNumber == 0) {
+        
+        if (_selectRow == 0) {
+            
+        } else if (_selectRow == 1) {
+            [parameters setObject:@"initial" forKey:@"state"];
+        } else if (_selectRow == 2) {
+            [parameters setObject:@"reported" forKey:@"state"];
+        } else {
+            [parameters setObject:@"finished" forKey:@"state"];
+            
+        }
+        NSArray *array = @[@{@"field":@"state"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+        _screenView.textView.text = @"";
+    } else if (_screenView.groupTabBar.selectNumber == 1) {
+        if (_screenView.textView.text.length != 0){
+            [parameters setObject:_screenView.textView.text forKey:@"titleLike"];
+            NSArray *array = @[@{@"field":@"name"}];
+            [parameters setObject:array forKey:@"queryOrders"];
+        }
+    } else {
+        
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+        
+        // 当前时间
+        NSDate *today = [NSDate date];
+        NSString *todayStr = [dateFormatter stringFromDate:today];
+        
+        if (_timeSelectNum == 0) {
+            
+            NSDate *week = [today dateByAddingTimeInterval:-60*60*24*7];
+            NSString *weekStr = [dateFormatter stringFromDate:week];
+            
+            [parameters setObject:weekStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeSelectNum == 1) {
+            
+            NSDate *oneMonth = [self getPriousorLaterDateFromDate:today withMonth:-1];
+            NSString *oneMonthStr = [dateFormatter stringFromDate:oneMonth];
+            
+            [parameters setObject:oneMonthStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+            
+        } else if (_timeSelectNum == 2) {
+            NSDate *threeMonth = [self getPriousorLaterDateFromDate:today withMonth:-3];
+            NSString *threeMonthStr = [dateFormatter stringFromDate:threeMonth];
+            
+            [parameters setObject:threeMonthStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeSelectNum == 3) {
+            NSDate *oneYear = [self getPriousorLaterDateFromDate:today withMonth:-12];
+            NSString *oneYearStr = [dateFormatter stringFromDate:oneYear];
+            
+            [parameters setObject:oneYearStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else {
+            NSDate *oneYear = [self getPriousorLaterDateFromDate:today withMonth:-12];
+            NSString *oneYearStr = [dateFormatter stringFromDate:oneYear];
+            [parameters setObject:oneYearStr forKey:@"endDateTo"];
+        }
+        NSArray *array = @[@{@"field":@"endDate",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    }
+    NSLog(@"parrr = %@", parameters);
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    
+    [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 = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+                [self requestMoreList];
+            }];
+            [self.tableView reloadData];
+        }
+        
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        self.menuView.backgroundColor = kInspectSectionBackGroundColor;
+    }];
+
+}
+
+- (NSDate *)getPriousorLaterDateFromDate:(NSDate *)date withMonth:(int)month
+{
+    NSDateComponents *comps = [[NSDateComponents alloc] init];
+    [comps setMonth:month];
+    NSCalendar *calender = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+    NSDate *mDate = [calender dateByAddingComponents:comps toDate:date options:0];
+    return mDate;
 }
 
+
 #pragma mark - UITableView Delegate/DataSource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
@@ -375,6 +490,60 @@
 #pragma mark - TaxisDelegate
 - (void)timeChange:(UIButton *)sender
 {
+    HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
+    NSArray *queryOrders;
+    
+    if (sender.tag - kTAxisBtnTag == 1) {
+        queryOrders = @[];
+        
+    } else if (sender.tag - kTAxisBtnTag == 2) {
+        
+        queryOrders = @[@{@"field":@"endDate",
+                          @"direction":@"desc"}];
+        
+    } else {
+        queryOrders = @[@{@"field":@"endDate",
+                          @"direction":@"asc"}];
+    }
+    
+    
+    // 相关参数
+    NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
+                                 @"pageNumber":@(0),
+                                 @"pageSize":@(10),
+                                 @"queryOrders":queryOrders
+                                 };
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    [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 = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+                [self requestMoreList];
+            }];
+            [self.tableView reloadData];
+        }
+        
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        self.menuView.backgroundColor = kInspectSectionBackGroundColor;
+    }];
+
     [self closeRedView];
 }
 

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

@@ -108,7 +108,7 @@
     HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]];
     // 相关参数
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
-    NSDictionary *parameters = @{@"user":user_uuid,
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
                                  @"pageNumber":@(0),
                                  @"pageSize":@(10)
                                  };
@@ -151,7 +151,7 @@
     HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]];
     // 相关参数
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
-    NSDictionary *parameters = @{@"user":user_uuid,
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
                                  @"pageNumber":@(0),
                                  @"pageSize":@(10)
                                  };
@@ -235,6 +235,7 @@
     }
     if (!_taxisView) {
         _taxisView = [[TaxisView alloc] init];
+        _taxisView.tag = 3928342;
         _taxisView.backgroundColor = [UIColor whiteColor];
     }
     
@@ -278,7 +279,7 @@
         [_bgView addGestureRecognizer:tapGR];
     }
     if (!_screenView) {
-        _screenView = [[ScreenView alloc] initWithTitleArray:[NSArray arrayWithObjects:@"待解决", @"已解决",@"已作废",nil]];
+        _screenView = [[ScreenView alloc] initWithTitleArray:[NSArray arrayWithObjects:@"全部",@"未处理", @"已处理",@"已完成",nil]];
         _screenView.delegate = self;
         _screenView.inspectTableView.inspectDelegate = self;
         _screenView.backgroundColor = [UIColor whiteColor];
@@ -333,9 +334,125 @@
 // 提交按钮
 - (void)submitClick:(UIButton *)sender
 {
+    NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL];
+    HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
+    NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                       [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid",
+                                       @[],@"queryOrders",
+                                       @(0),@"pageNumber",
+                                       @(10),@"pageSize", nil];
     
+    if (_screenView.groupTabBar.selectNumber == 0) {
+        
+        if (_selectRow == 0) {
+            
+        } else if (_selectRow == 1) {
+            [parameters setObject:@"initial" forKey:@"state"];
+        } else if (_selectRow == 2) {
+            [parameters setObject:@"reported" forKey:@"state"];
+        } else {
+            [parameters setObject:@"finished" forKey:@"state"];
+
+        }
+        NSArray *array = @[@{@"field":@"state"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+        _screenView.textView.text = @"";
+    } else if (_screenView.groupTabBar.selectNumber == 1) {
+        if (_screenView.textView.text.length != 0){
+            [parameters setObject:_screenView.textView.text forKey:@"titleLike"];
+            NSArray *array = @[@{@"field":@"name"}];
+            [parameters setObject:array forKey:@"queryOrders"];
+        }
+    } else {
+        
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+        
+        // 当前时间
+        NSDate *today = [NSDate date];
+        NSString *todayStr = [dateFormatter stringFromDate:today];
+        
+        if (_timeSelectNum == 0) {
+            
+            NSDate *week = [today dateByAddingTimeInterval:-60*60*24*7];
+            NSString *weekStr = [dateFormatter stringFromDate:week];
+            
+            [parameters setObject:weekStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeSelectNum == 1) {
+            
+            NSDate *oneMonth = [self getPriousorLaterDateFromDate:today withMonth:-1];
+            NSString *oneMonthStr = [dateFormatter stringFromDate:oneMonth];
+            
+            [parameters setObject:oneMonthStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+            
+        } else if (_timeSelectNum == 2) {
+            NSDate *threeMonth = [self getPriousorLaterDateFromDate:today withMonth:-3];
+            NSString *threeMonthStr = [dateFormatter stringFromDate:threeMonth];
+            
+            [parameters setObject:threeMonthStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeSelectNum == 3) {
+            NSDate *oneYear = [self getPriousorLaterDateFromDate:today withMonth:-12];
+            NSString *oneYearStr = [dateFormatter stringFromDate:oneYear];
+            
+            [parameters setObject:oneYearStr forKey:@"endDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else {
+            NSDate *oneYear = [self getPriousorLaterDateFromDate:today withMonth:-12];
+            NSString *oneYearStr = [dateFormatter stringFromDate:oneYear];
+            [parameters setObject:oneYearStr forKey:@"endDateTo"];
+        }
+        NSArray *array = @[@{@"field":@"endDate",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    }
+    NSLog(@"parrr = %@", parameters);
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    [httpCilent getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
+        NSLog(@"管理层的抽查列表 response= %@", response);
+        NSLog(@"管理层的抽查列表 error= %@", error);
+        
+        
+        
+        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 = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+                [self requestMoreList];
+            }];
+            [self.tableView reloadData];
+        }
+        
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        self.menuView.backgroundColor = kInspectSectionBackGroundColor;
+    }];
+
 }
 
+- (NSDate *)getPriousorLaterDateFromDate:(NSDate *)date withMonth:(int)month
+{
+    NSDateComponents *comps = [[NSDateComponents alloc] init];
+    [comps setMonth:month];
+    NSCalendar *calender = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+    NSDate *mDate = [calender dateByAddingComponents:comps toDate:date options:0];
+    return mDate;
+}
+
+
 #pragma mark - InspectTableViewDelegate
 - (void)inspectTableViewDidSelectWithRow:(NSInteger)row
 {
@@ -345,6 +462,64 @@
 #pragma mark - TaxisDelegate
 - (void)timeChange:(UIButton *)sender
 {
+    
+    NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL];
+    HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
+    NSArray *queryOrders;
+    
+    if (sender.tag - kTAxisBtnTag == 1) {
+        queryOrders = @[];
+        
+    } else if (sender.tag - kTAxisBtnTag == 2) {
+        
+        queryOrders = @[@{@"field":@"endDate",
+                          @"direction":@"desc"}];
+        
+    } else {
+        queryOrders = @[@{@"field":@"endDate",
+                          @"direction":@"asc"}];
+    }
+    
+    
+    // 相关参数
+    NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
+    NSDictionary *parameters = @{@"userUuid":user_uuid,
+                                 @"pageNumber":@(0),
+                                 @"pageSize":@(10),
+                                 @"queryOrders":queryOrders
+                                 };
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    [httpCilent getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
+        NSLog(@"管理层的抽查列表 response= %@", response);
+        NSLog(@"管理层的抽查列表 error= %@", error);
+        
+        
+        
+        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 = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+                [self requestMoreList];
+            }];
+            [self.tableView reloadData];
+        }
+        
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        self.menuView.backgroundColor = kInspectSectionBackGroundColor;
+    }];
+
     [self closeRedView];
 }
 

redstar/Classes/Module/Function/Standar/StandardHandout/ViewController/HandOutViewController.m

@@ -272,6 +272,10 @@
 #pragma mark - TaxisDelegate
 - (void)timeChange:(UIButton *)sender
 {
+    
+    
+    
+    
     [self closeRedView];
 }
 

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/ViewController/InspectListViewController.m

@@ -22,7 +22,6 @@
 #import "NoDataView.h"
 #import <MJRefresh.h>
 
-#define kTAxisBtnTag 500232
 
 #define kInspectListCell @"InspectListCellTableViewCell"
 

redstar/Classes/Tools/Menu/Taxis/View/TaxisView.h

@@ -7,7 +7,6 @@
 //
 
 #import <UIKit/UIKit.h>
-#define kTAxisBtnTag 500232
 
 @protocol TaxisViewDelegate <NSObject>