正在显示
1 个修改的文件
包含
6 行增加
和
2 行删除
| @@ -28,6 +28,10 @@ class Duplicate extends DoubleBase | @@ -28,6 +28,10 @@ class Duplicate extends DoubleBase | ||
| 28 | if ($this->request->isAjax()) { | 28 | if ($this->request->isAjax()) { |
| 29 | list($where, $sort, $order, $offset, $limit) = $this->buildparams(); | 29 | list($where, $sort, $order, $offset, $limit) = $this->buildparams(); |
| 30 | 30 | ||
| 31 | + $matchInfo = Db::name('project_container')->where(['id' => $this->containerId])->find(); | ||
| 32 | + | ||
| 33 | + $rate = $matchInfo['checkagain'] == 1 ? $matchInfo['checkagain_scale'] : 100; | ||
| 34 | + | ||
| 31 | // 默认查询项目容器下未淘汰(|未退回)的项目 | 35 | // 默认查询项目容器下未淘汰(|未退回)的项目 |
| 32 | $field = [ | 36 | $field = [ |
| 33 | 'a.*', | 37 | 'a.*', |
| @@ -47,7 +51,7 @@ class Duplicate extends DoubleBase | @@ -47,7 +51,7 @@ class Duplicate extends DoubleBase | ||
| 47 | ->join('college c', 'u.college = c.id', 'left') | 51 | ->join('college c', 'u.college = c.id', 'left') |
| 48 | ->join('specialty d', 'u.specialty = d.id', 'left') | 52 | ->join('specialty d', 'u.specialty = d.id', 'left') |
| 49 | ->where(['a.container_id' => $this->containerId,'review_stage' => 0]) | 53 | ->where(['a.container_id' => $this->containerId,'review_stage' => 0]) |
| 50 | - ->where('a.repeat_rate','neq',0) | 54 | + ->where('a.repeat_rate','neq',$rate) |
| 51 | ->count(); | 55 | ->count(); |
| 52 | $list = $this->model | 56 | $list = $this->model |
| 53 | ->field($field) | 57 | ->field($field) |
| @@ -58,7 +62,7 @@ class Duplicate extends DoubleBase | @@ -58,7 +62,7 @@ class Duplicate extends DoubleBase | ||
| 58 | ->join('fa_members m','a.id = m.item_id and member_type = 1 and member_source = 2','left') | 62 | ->join('fa_members m','a.id = m.item_id and member_type = 1 and member_source = 2','left') |
| 59 | ->join('specialty d', 'u.specialty = d.id', 'left') | 63 | ->join('specialty d', 'u.specialty = d.id', 'left') |
| 60 | ->where(['a.container_id' => $this->containerId,'review_stage' => 0]) | 64 | ->where(['a.container_id' => $this->containerId,'review_stage' => 0]) |
| 61 | - ->where('a.repeat_rate','neq',0) | 65 | + ->where('a.repeat_rate','neq',$rate) |
| 62 | ->group('a.id') | 66 | ->group('a.id') |
| 63 | ->limit($offset, $limit) | 67 | ->limit($offset, $limit) |
| 64 | ->select(); | 68 | ->select(); |
-
请 注册 或 登录 后发表评论