|
@@ -48,7 +48,6 @@ class CerconfirmService extends CrudService {
|
|
|
if (res.length <= 0)list.push(student);
|
|
|
}
|
|
|
}
|
|
|
- console.log(list.length);
|
|
|
// 计算分数
|
|
|
list = await this.getScore(list);
|
|
|
return list;
|
|
@@ -76,6 +75,12 @@ class CerconfirmService extends CrudService {
|
|
|
list
|
|
|
);
|
|
|
}
|
|
|
+ list = list.map(i => {
|
|
|
+ if (!i.score && i.job.includes('普通')) {
|
|
|
+ i.score = _.round((i.daily * 1 || 0) + (i.groupscore * 1 || 0) + (i.task * 1 || 0), 2);
|
|
|
+ }
|
|
|
+ return i;
|
|
|
+ });
|
|
|
list = _.orderBy(list, [ 'is_fine' ], [ 'desc' ]);
|
|
|
return list;
|
|
|
}
|