no message

XFFruit/Utilities/IBTUIKit/IBTCommon.h

@@ -51,4 +51,6 @@
 + (NSInteger)getWeeks:(NSInteger)year;
 + (NSString*)weekdayStringFromDate:(NSDate*)inputDate;
 +(NSString *)countNumAndChangeformat:(NSString *)num;
++ (NSString *)getWeekFromDateStr:(NSString *)dataStr;
+
 @end

XFFruit/Utilities/IBTUIKit/IBTCommon.m

@@ -175,6 +175,11 @@
     [formatter setDateFormat:@"yyyy.MM.dd"];
     return [formatter dateFromString:dateString];
 }
++ (NSDate *)convertToDateFromStr:(NSString *)dateString{
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyy-MM-dd"];
+    return [formatter dateFromString:dateString];
+}
 + (NSString *)stringFromDate:(NSDate*)aDate{
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
     [formatter setDateFormat:@"yyyy-MM-dd "];
@@ -314,8 +319,10 @@
     NSString *yearWeek = @"";
     NSCalendar *greCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
     NSDateComponents *dateComponents = [greCalendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSWeekCalendarUnit | NSWeekdayCalendarUnit | NSWeekOfMonthCalendarUnit | NSWeekOfYearCalendarUnit fromDate:[NSDate date]];
-    NSString *year = [IBTCommon stringFromDateWithFormat:[NSDate date]  format:@"yyyy"];
-    if (dateComponents.weekOfYear == 1) {
+    NSString *yearStr = [IBTCommon stringFromDateWithFormat:[NSDate 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{