|
@@ -34,7 +34,7 @@ class Projectitem extends Frontend |
|
@@ -34,7 +34,7 @@ class Projectitem extends Frontend |
|
34
|
// 查询学生参与的作品
|
34
|
// 查询学生参与的作品
|
|
35
|
$memberModel = new Member();
|
35
|
$memberModel = new Member();
|
|
36
|
$list = $memberModel->alias('m')
|
36
|
$list = $memberModel->alias('m')
|
|
37
|
- ->field('m.is_captain,r.*,pc.container_name , pt.name , pc.midterm_review_starttime, pc.midterm_review_endtime,pc.conclusion_starttime,pc.conclusion_endtime,pc.container_desc,pc.project_starttime,pc.project_endtime,pc.project_double_starttime,pc.project_double_endtime,pc.can_apply_mid,pc.can_apply_conclusion,pc.can_apply_approval')
|
37
|
+ ->field('m.is_captain,r.*,pc.container_name , pt.name , pc.midterm_review_starttime, pc.midterm_review_endtime,pc.conclusion_starttime,pc.conclusion_endtime,pc.container_desc,pc.project_starttime,pc.project_endtime,pc.project_double_starttime,pc.project_double_endtime,pc.can_apply_mid,pc.can_apply_conclusion,pc.can_apply_approval,pc.checkagain,pc.checkagain_scale')
|
|
38
|
->join('project_register r','m.item_id = r.id','inner')
|
38
|
->join('project_register r','m.item_id = r.id','inner')
|
|
39
|
->join('project_container pc','pc.id = r.container_id','left')
|
39
|
->join('project_container pc','pc.id = r.container_id','left')
|
|
40
|
->join('project_type pt','pt.id = r.project_type','left')
|
40
|
->join('project_type pt','pt.id = r.project_type','left')
|
|
@@ -50,6 +50,14 @@ class Projectitem extends Frontend |
|
@@ -50,6 +50,14 @@ class Projectitem extends Frontend |
|
50
|
->where(['m.member_type' => Member::STUDENT,'m.member_source' => Member::PROJECT,'m.member_id' => $this->auth->id])
|
50
|
->where(['m.member_type' => Member::STUDENT,'m.member_source' => Member::PROJECT,'m.member_id' => $this->auth->id])
|
|
51
|
->where('r.deletetime',null)
|
51
|
->where('r.deletetime',null)
|
|
52
|
->count();
|
52
|
->count();
|
|
|
|
53
|
+ if($count) {
|
|
|
|
54
|
+ foreach ($list as $val) {
|
|
|
|
55
|
+ $val['checkagain_status'] = 0;
|
|
|
|
56
|
+ if($val['checkagain'] == 1) {
|
|
|
|
57
|
+ $val['checkagain_status'] = $val['repeat_rate'] < $val['checkagain_scale'] ? 1 : 2;
|
|
|
|
58
|
+ }
|
|
|
|
59
|
+ }
|
|
|
|
60
|
+ }
|
|
53
|
$this->assign('_list',$list);
|
61
|
$this->assign('_list',$list);
|
|
54
|
$this->assign('login_id',$this->auth->id);
|
62
|
$this->assign('login_id',$this->auth->id);
|
|
55
|
$this->assign('_list_count',$count);
|
63
|
$this->assign('_list_count',$count);
|