完成问题的筛选

redstar/Classes/Module/Check/CheckPicViewController.m

@@ -23,9 +23,22 @@
     self.takeImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
     _takeImageView.image = _checkImage;
     [self.view addSubview:_takeImageView];
+    
+    UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    backBtn.frame = CGRectMake(0, 0, 30, 44);
+    
+    [backBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
+    [backBtn addTarget:self action:@selector(doBack:) forControlEvents:UIControlEventTouchUpInside];
+    
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn];
+    self.navigationItem.leftBarButtonItem = backItem;
 
-}
 
+}
+-(void)doBack:(id)sender
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
 
 
 - (void) addGestureRecognizerToView:(UIView *)view {

redstar/Classes/Module/Function/Question/QuestionList/View/MoreScreenView.m

@@ -13,6 +13,8 @@
 
 @interface MoreScreenView ()<GroupTabBarDelegate, UITextViewDelegate>
 @property (nonatomic, strong) UIView *backView;
+@property (nonatomic, strong) UILabel *placeholderLabel1;
+@property (nonatomic, strong) UILabel *placeholderLabel2;
 @end
 
 @implementation MoreScreenView
@@ -56,9 +58,23 @@
     GroupItems *categoryItem = [[GroupItems alloc] initWithTitle:@"问题分类" view:_categoryTableView];
     
     self.textView1 = [[UITextView alloc] init];
+    _textView1.delegate = self;
+    _textView1.tag = 9991;
+    self.placeholderLabel1 = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 100, 30)];
+    self.placeholderLabel1.text = @"请输入标题...";
+    self.placeholderLabel1.font = [UIFont systemFontOfSize:15.0];
+    self.placeholderLabel1.textColor = kOnLineCellDetailColor;
+    [self.textView1 addSubview:self.placeholderLabel1];
     GroupItems *textViewItem1 = [[GroupItems alloc] initWithTitle:@"标题类似于" view:_textView1];
 
     self.textView2 = [[UITextView alloc] init];
+    _textView2.delegate = self;
+    _textView2.tag = 9992;
+    self.placeholderLabel2 = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 100, 30)];
+    self.placeholderLabel2.text = @"请输入关键字...";
+    self.placeholderLabel2.font = [UIFont systemFontOfSize:15.0];
+    self.placeholderLabel2.textColor = kOnLineCellDetailColor;
+    [self.textView2 addSubview:self.placeholderLabel2];
     GroupItems *textViewItem2 = [[GroupItems alloc] initWithTitle:@"关键字类似于" view:_textView2];
     
     self.stateTableView = [[StateTableView alloc] init];
@@ -169,6 +185,45 @@
     return _submitBtn;
 }
 
-
+#pragma mark - UITextView Delegate
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    if (![text isEqualToString:@""]) {
+        if (textView.tag == 9991) {
+            self.placeholderLabel1.hidden = YES;
+        } else {
+            self.placeholderLabel2.hidden = YES;
+        }
+    }
+    
+    if ([text isEqualToString:@""] && range.location == 0 && range.length == 1) {
+        if (textView.tag == 9991) {
+            self.placeholderLabel1.hidden = NO;
+        } else {
+            self.placeholderLabel2.hidden = NO;
+        }
+    }
+    
+    if ([text isEqualToString:@"\n"]) {
+        [self.textView1 resignFirstResponder];
+        [self.textView2 resignFirstResponder];
+        
+        if (textView.tag == 9991) {
+            if (textView.text.length != 0) {
+                self.placeholderLabel1.hidden = YES;
+            } else {
+                self.placeholderLabel1.hidden = NO;
+            }
+        } else {
+            if (textView.text.length != 0) {
+                self.placeholderLabel2.hidden = YES;
+            } else {
+                self.placeholderLabel2.hidden = NO;
+            }
+        }
+        return NO;
+    }
+    
+    return YES;
+}
 
 @end

redstar/Classes/Module/Function/Question/QuestionList/View/SubViews/CategoryTableView.m

@@ -35,7 +35,7 @@
 {
     self.delegate = self;
     self.dataSource = self;
-    self.titleArray = [NSMutableArray arrayWithObjects:@"111",@"222",  nil];
+    self.titleArray = [NSMutableArray arrayWithObjects:@"基础环境",@"人员", @"停车场",@"卫生间", @"物料标识",  nil];
     
     NSInteger selectedIndex = 0;
     NSIndexPath *selectedIndexPath = [NSIndexPath indexPathForRow:selectedIndex inSection:0];

redstar/Classes/Module/Function/Question/QuestionList/View/SubViews/StateTableView.m

@@ -33,7 +33,7 @@
 
 - (void)setup
 {
-    self.titleArray = [NSMutableArray arrayWithObjects:@"已创建",@"已完成",@"已作废",nil];
+    self.titleArray = [NSMutableArray arrayWithObjects:@"待解决",@"已解决",@"已作废",nil];
     self.delegate = self;
     self.dataSource = self;
     

redstar/Classes/Module/Function/Question/QuestionList/View/SubViews/TimeTableView.m

@@ -33,7 +33,7 @@
 
 - (void)setup
 {
-    self.titleArray = [NSMutableArray arrayWithObjects:@"全部",@"一周",@"一月",@"三月",@"一年",@"历史更多", nil];
+    self.titleArray = [NSMutableArray arrayWithObjects:@"全部",@"一周",@"一月",@"三个月",@"一年",@"历史更多", nil];
     self.delegate = self;
     self.dataSource = self;
     

redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m

@@ -26,7 +26,7 @@
 
 #define kQuestionListCell @"questionListTableViewCell"
 #define kThumbTag 745645
-@interface QuestionViewController () <UITableViewDelegate, UITableViewDataSource, TaxisViewDelegate>
+@interface QuestionViewController () <UITableViewDelegate, UITableViewDataSource, TaxisViewDelegate, ScopeTableViewDelegate, GroupTableViewDelegate, CategoryTableViewDelegate, StateTableViewDelegate, TimeTableViewDelegate>
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *allQuestionArray;
 
@@ -42,11 +42,15 @@
 
 @property (nonatomic, strong) NoDataView *noDataView;
 
-@property (nonatomic, assign) NSInteger selectRow;
-@property (nonatomic, assign) NSInteger timeSelectNum;
-
 @property (nonatomic, assign) NSInteger page;
 
+@property (nonatomic, assign) NSInteger scopeRow;
+@property (nonatomic, assign) NSInteger groupRow;
+@property (nonatomic, assign) NSInteger categoryRow;
+@property (nonatomic, assign) NSInteger stateRow;
+@property (nonatomic, assign) NSInteger timeRow;
+
+
 @end
 
 @implementation QuestionViewController
@@ -250,7 +254,6 @@
     
     if (_selctedButton.tag == sender.tag) {
         
-        
         if (sender.isDrop) {
             if (sender.tag == 4001) {
                 [self showRedView];
@@ -364,6 +367,11 @@
     if (!_screenView) {
         _screenView = [[MoreScreenView alloc] init];
         _screenView.backgroundColor = [UIColor whiteColor];
+        _screenView.scopeTableView.scopeDeleagte = self;
+        _screenView.groupTableView.groupDeleagte = self;
+        _screenView.categoryTableView.categroyDeleagte = self;
+        _screenView.stateTableView.stateDeleagte = self;
+        _screenView.timeTableView.timeDeleagte = self;
     }
     [_screenView.resetBtn addTarget:self action:@selector(resetClick:) forControlEvents:UIControlEventTouchUpInside];
     [_screenView.submitBtn addTarget:self action:@selector(submitClick:) forControlEvents:UIControlEventTouchUpInside];
@@ -409,7 +417,18 @@
 // 重置按钮
 - (void)resetClick:(UIButton *)sender
 {
-   
+    NSInteger selectedIndex = 0;
+    NSIndexPath *selectedIndexPath = [NSIndexPath indexPathForRow:selectedIndex inSection:0];
+    [_screenView.scopeTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    [_screenView.groupTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    [_screenView.categoryTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    [_screenView.stateTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    [_screenView.timeTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    
+    _screenView.textView1.text = @"";
+    _screenView.textView2.text = @"";
+
+
 }
 // 提交按钮
 - (void)submitClick:(UIButton *)sender
@@ -421,9 +440,9 @@
   
     NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                        user_uuid,@"user",
-                                       @"all",@"scope",
                                        @(0),@"pageNumber",
                                        @(10),@"pageSize", nil];
+    
     // 发起请求
     HttpClient *httpClient = [[HttpClient alloc] initWithUrl:urlStr];
     //
@@ -431,9 +450,115 @@
     
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     
+    if (_screenView.groupTabBar.selectNumber == 0) {
+        if (_scopeRow == 0) {
+            [parameters setObject:@"all" forKey:@"scope"];
+        } else {
+            [parameters setObject:@"mine" forKey:@"scope"];
+        }
+        NSArray *array = @[@{@"field":@"scope",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    } else if (_screenView.groupTabBar.selectNumber == 1) {
+        if (_groupRow == 0) {
+            
+        } else if (_groupRow == 1) {
+            [parameters setObject:@"服务" forKey:@"group"];
+        } else if (_groupRow == 2) {
+            [parameters setObject:@"环境企划" forKey:@"group"];
+        } else {
+            [parameters setObject:@"环境物业" forKey:@"group"];
+        }
+        NSArray *array = @[@{@"field":@"group",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    } else if (_screenView.groupTabBar.selectNumber == 2) {
+        if (_categoryRow == 0) {
+            [parameters setObject:@"基础环境" forKey:@"category"];
+        } else if (_categoryRow == 1) {
+            [parameters setObject:@"人员" forKey:@"category"];
+        } else if (_categoryRow == 2) {
+            [parameters setObject:@"停车场" forKey:@"category"];
+        } else if (_categoryRow == 3) {
+            [parameters setObject:@"卫生间" forKey:@"category"];
+        } else {
+            [parameters setObject:@"物料标识" forKey:@"category"];
+        }
+        NSArray *array = @[@{@"field":@"category",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    } else if (_screenView.groupTabBar.selectNumber == 3) {
+        [parameters setObject:_screenView.textView1.text forKey:@"contentLike"];
+        NSArray *array = @[@{@"field":@"contentLike",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+
+    } else if (_screenView.groupTabBar.selectNumber == 4) {
+        [parameters setObject:_screenView.textView2.text forKey:@"keyword"];
+        NSArray *array = @[@{@"field":@"keyword",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+
+    } else if (_screenView.groupTabBar.selectNumber == 5) {
+        if (_stateRow == 0) {
+            [parameters setObject:@"created" forKey:@"state"];
+        } else if (_stateRow == 1) {
+            [parameters setObject:@"resolved" forKey:@"state"];
+        } else {
+            [parameters setObject:@"aborted" forKey:@"state"];
+        }
+        NSArray *array = @[@{@"field":@"state",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    } else if (_screenView.groupTabBar.selectNumber == 6) {
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+        
+        // 当前时间
+        NSDate *today = [NSDate date];
+        NSString *todayStr = [dateFormatter stringFromDate:today];
+        if (_timeRow == 0) {
+            
+        } else if (_timeRow == 1) {
+            
+            NSDate *week = [today dateByAddingTimeInterval:-60*60*24*7];
+            NSString *weekStr = [dateFormatter stringFromDate:week];
+            
+            [parameters setObject:weekStr forKey:@"beginDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeRow == 2) {
+            
+            NSDate *oneMonth = [self getPriousorLaterDateFromDate:today withMonth:-1];
+            NSString *oneMonthStr = [dateFormatter stringFromDate:oneMonth];
+            NSLog(@"oneMonth = %@", oneMonthStr);
+            
+            [parameters setObject:oneMonthStr forKey:@"beginDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+            
+        } else if (_timeRow == 3) {
+            NSDate *threeMonth = [self getPriousorLaterDateFromDate:today withMonth:-3];
+            NSString *threeMonthStr = [dateFormatter stringFromDate:threeMonth];
+            
+            [parameters setObject:threeMonthStr forKey:@"beginDateFrom"];
+            [parameters setObject:todayStr forKey:@"endDateTo"];
+        } else if (_timeRow == 4) {
+            NSDate *oneYear = [self getPriousorLaterDateFromDate:today withMonth:-12];
+            NSString *oneYearStr = [dateFormatter stringFromDate:oneYear];
+            
+            [parameters setObject:oneYearStr forKey:@"beginDateFrom"];
+            [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":@"lastModifyInfo",
+                             @"direction":@"asc"}];
+        [parameters setObject:array forKey:@"queryOrders"];
+    }
     
-    
-    
+    NSLog(@"parameters = %@",parameters);
     // 请求问题列表
     [httpClient getQuestionListWithParameters:parameters completion:^(id response, NSError *error) {
         NSDictionary *dataDict = (NSDictionary *)response[@"data"];
@@ -479,28 +604,41 @@
     return mDate;
 }
 
+#pragma mark - MoreScreenDelegate
+- (void)scopeTableViewClick:(NSInteger)row
+{
+    _scopeRow = row;
+}
 
+- (void)groupTableViewClick:(NSInteger)row
+{
+    _groupRow = row;
+}
 
+- (void)categoryTableViewClick:(NSInteger)row
+{
+    _categoryRow = row;
+}
 
-#pragma mark - InspectTableViewDelegate
-- (void)inspectTableViewDidSelectWithRow:(NSInteger)row
+- (void)stateTableViewClick:(NSInteger)row
 {
-    _selectRow = row;
+    _stateRow = row;
 }
 
+- (void)timeTableViewClick:(NSInteger)row
+{
+    _timeRow = row;
+}
+
+
 #pragma mark - TaxisDelegate
 - (void)timeChange:(UIButton *)sender
 {
-    
-    
-    
     // 请求地址
     NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
     
-    
     NSArray *queryOrders;
-    
     if (sender.tag - kTAxisBtnTag == 1) {
         queryOrders = @[];
         
@@ -565,11 +703,6 @@
     [self closeRedView];
 }
 
-#pragma mark - ScreenTableDelegate
-- (void)tableViewDidSelectRow:(NSInteger)row
-{
-    _timeSelectNum = row;
-}
 
 #pragma mark - UItableView Delegate/DataSource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@@ -603,11 +736,7 @@
     return 120;
 }
 
-// section高度
-//- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-//    return 45;
-//}
+
 
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {

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

@@ -415,7 +415,7 @@
 {
     NSInteger selectedIndex = 0;
     NSIndexPath *selectedIndexPath = [NSIndexPath indexPathForRow:selectedIndex inSection:0];
-    [_screenView.tableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+    [_screenView.inspectTableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
     
     _screenView.textView.text = @"";
     

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/View/InspectDetailView.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "InspectListCell.h"
 
+
 @interface InspectDetailView : UIView
 @property (nonatomic, strong) UILabel *shopnameLabel; // 商店名称
 @property (nonatomic, strong) UILabel *startDateLabel; // 起始时间