Commit 54fe9a26 authored by 曹云霄's avatar 曹云霄

修改项说明:修复考核分数比较误差

parent ebc84d85
......@@ -257,7 +257,6 @@
page.page = ONE;
page.rows = KROWS;
_afficheModel.page = page;
_afficheModel.dayCountEquals = 20;
_afficheModel.sort = @"createDate";
_afficheModel.order = SORTDIRECTION_DESC;
_afficheModel.departIdEquals = [Shoppersmanager manager].Shoppers.employee.departid;
......
......@@ -227,7 +227,7 @@
studyResult.details = (NSArray<TOStudyResultDetailEntity>*)submitAnswerArray;
studyResult.grade = [NSNumber numberWithInteger:allScore];
//判断考核是否合格
studyResult.examResult = (self.taskDetails.passGrade < allScore)?@"1":@"0";
studyResult.examResult = (self.taskDetails.passGrade <= allScore)?@"1":@"0";
[XBLoadingView showHUDViewWithDefault];
WS(weakSelf);
NSLog(@"%@",[[studyResult toDictionary] JSONString])
......
......@@ -456,7 +456,7 @@
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSDictionary *dict = returnValue[@"data"];
if (!dict) {
if (!dict || [dict isKindOfClass:[NSNull class]]) {
return;
}
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:[NSString stringWithFormat:@"发现新版本%@,快去更新吧!",dict[@"version"]] preferredStyle:UIAlertControllerStyleAlert];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment