报表： modify 日周月的oneCliced 以日为标准

如果选了日，再选周、选月。则周、月对于的是日所在的。如果单独重选了周，则选月、选日，不变。。。。。

XFFruit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Utilities/IBTUIKit/IBTCommon.h

@@ -35,6 +35,8 @@
 + (NSDate *)convertToDateFrom:(NSString *)dateString;
 + (NSString *)stringFromDate:(NSDate*)aDate;
 + (NSString *)stringFromDateWithFormat:(NSDate*)aDate format:(NSString *)format;
++ (NSDate *)dateFromStringWithFormat:(NSString*)aStr format:(NSString *)format;
+
 + (NSString*)dictionaryToJson:(id)dic;
 + (NSString *)checkString:(NSString *)str;
 + (NSString *)checkNull: (id)data;
@@ -48,6 +50,7 @@
 + (UIButton *)buttonWithTitle:(NSString *)title Image:(UIImage *)image frame:(CGRect)frame fontSize:(float)fontSize fontColor:(UIColor *)color;
 + (UIButton *)buttonWithImage:(UIImage *)image frame:(CGRect)frame;
 + (NSString *)getWeekFromDate;
++ (NSString *)getWeekFromDateWithDate: (NSDate *)date;
 + (NSInteger)getWeeks:(NSInteger)year;
 + (NSString*)weekdayStringFromDate:(NSDate*)inputDate;
 +(NSString *)countNumAndChangeformat:(NSString *)num;

XFFruit/Utilities/IBTUIKit/IBTCommon.m

@@ -192,7 +192,12 @@
     NSString *dateString = [formatter stringFromDate:aDate];
     return dateString;
 }
-
++ (NSDate *)dateFromStringWithFormat:(NSString*)aStr format:(NSString *)format {
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:format];
+    NSDate *date = [formatter dateFromString:aStr];
+    return date;
+}
 + (NSString*)dictionaryToJson:(id)dic
 
 {
@@ -332,6 +337,24 @@
     
     return yearWeek;
 }
++ (NSString *)getWeekFromDateWithDate: (NSDate *)date{
+    NSString *yearWeek = @"";
+    NSCalendar *greCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+    NSDateComponents *dateComponents = [greCalendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSWeekCalendarUnit | NSWeekdayCalendarUnit | NSWeekOfMonthCalendarUnit | NSWeekOfYearCalendarUnit fromDate:date];
+    NSString *yearStr = [IBTCommon stringFromDateWithFormat:date  format:@"yyyy-MM-dd"];
+    NSString *year = [yearStr substringToIndex:4];
+    NSString *month = [yearStr substringWithRange:NSMakeRange(5,2)];
+    if (dateComponents.weekOfYear == 1 && [month isEqualToString:@"12"]) {
+        yearWeek = [NSString stringWithFormat:@"%ld-%ld", [year integerValue]+1
+                    ,(long)dateComponents.weekOfYear];
+    }else{
+        yearWeek = [NSString stringWithFormat:@"%ld-%ld", (long)[year integerValue]
+                    ,(long)dateComponents.weekOfYear];
+    }
+    
+    return yearWeek;
+}
+
 + (NSInteger)getWeeks:(NSInteger)year{
     NSInteger weeks = 0;
     NSString *dateStr = [NSString stringWithFormat:@"%ld-12-31 00:00:00",(long)year];

XFFruit/ViewControllers/Report/Controllers/ReportViewController.m

@@ -44,7 +44,8 @@
 @property (nonatomic,assign)NSInteger storeCount;
 @property (nonatomic,strong)NSIndexPath *currentIndex;
 @property (nonatomic,strong)NSMutableArray *selectArr;
-//@property (nonatomic, assign) BOOL isSegOne;
+
+
 
 @end
 
@@ -67,7 +68,6 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-//    self.isSegOne = NO;
     //布局
 #if 1
     self.dataArr = [NSMutableArray array];
@@ -122,13 +122,13 @@
         
     };
     [IBTLoadingView showProgressLabel:@"正在加载..."];
-    NSString *strDate;
-    if (self.scopeType) {
-        strDate = _scopeType;
-    } else {
-        strDate = [[NSDate date] localYMDString];
+    
+    NSDate *date ;
+    if (!_selectDay) {
+        self.selectDay = [[NSDate date]localYMDString];
     }
-    [[ICRHTTPController sharedController] getWeekbydayWithStringDate:strDate success:succ failure:fail];
+    date = [IBTCommon dateFromStringWithFormat:_selectDay format:@"yyyy-MM-dd" ];
+    [[ICRHTTPController sharedController] getWeekbydayWithStringDate:[date localYMDString] success:succ failure:fail];
 }
 
 #pragma mark - 获取上部数据
@@ -352,6 +352,13 @@
 
 #pragma mark - segViewDelegate
 - (void)customSegOneClick:(NSString *)title{
+    NSDate *date ;
+    if (!_selectDay) {
+        self.selectDay = [[NSDate date]localYMDString];
+//
+    }
+    date = [IBTCommon dateFromStringWithFormat:_selectDay format:@"yyyy-MM-dd" ];
+//    NSString *strDate = [_selectDay substringToIndex:_selectDay.length - 3];
     //日周年切换
     NSString *dayType = @"";
     if ([title isEqualToString:SaleWeek]) {
@@ -364,13 +371,14 @@
    
     if ([title isEqualToString:SaleDay]) {
         dayType = @"day";
-        self.scopeType = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd"];
-//    }else if ([title isEqualToString:SaleWeek]) {
-//        dayType = @"week";
-//        self.scopeType = [IBTCommon getWeekFromDate];
+        self.scopeType = _selectDay;//[IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd"];
+    }else if ([title isEqualToString:SaleWeek]) {
+        dayType = @"week";
+        self.scopeType = [IBTCommon getWeekFromDateWithDate:date];
     }else if ([title isEqualToString:SaleMonth]) {
         dayType = @"month";
-        self.scopeType = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM"];
+//        date = [IBTCommon dateFromStringWithFormat:strDate format:@"yyyy-MM" ];
+        self.scopeType = [IBTCommon stringFromDateWithFormat:date format:@"yyyy-MM"];
     } else {
         return;
     }