Merge pull request '测试资源-审查' (#678) from feature/testing_batch_list into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/678
master
廖金灵 2 years ago
commit 94a6c9f036

@ -821,6 +821,10 @@ class TestingResourceController extends ThinkController
$query = M('testing_resource_batch_list', 'tab_')->where($conditions)->order('create_time desc'); $query = M('testing_resource_batch_list', 'tab_')->where($conditions)->order('create_time desc');
$totalRow = M('testing_resource_batch_list', 'tab_')->field('sum(provide_amount) provide_amount_total')->where($conditions)->find();
$total = $totalRow['provide_amount_total'] ?? 0;
[$records, $page, $count] = $this->paginate($query); [$records, $page, $count] = $this->paginate($query);
$gameRepository = new GameRepository(); $gameRepository = new GameRepository();
@ -828,6 +832,7 @@ class TestingResourceController extends ThinkController
$this->assign('statusList', TestingResourceRepository::$userStatusList); $this->assign('statusList', TestingResourceRepository::$userStatusList);
$this->assign('games', $gameRepository->getChoiceGames()); $this->assign('games', $gameRepository->getChoiceGames());
$this->assign('count', $count); $this->assign('count', $count);
$this->assign('total', $total);
$this->assign('records', $records); $this->assign('records', $records);
$this->assign('_page', $page); $this->assign('_page', $page);
$this->display(); $this->display();

@ -119,7 +119,7 @@
</div> </div>
</div> </div>
<!-- 数据列表 --> <!-- 数据列表 -->
<div class="data_list"> <div class="data_list" style="margin-top: 15px">
<div class=""> <div class="">
<table> <table>
<!-- 表头 --> <!-- 表头 -->
@ -186,15 +186,17 @@
</tr> </tr>
</volist> </volist>
</empty> </empty>
<tr class="data_summary">
<td colspan="1">汇总</td>
<td colspan="99">
发放汇总金额:{$total}
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
<div class="page"> <div class="page">
<a class="sch-btn export-btn"
href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
{$_page|default=''} {$_page|default=''}
</div> </div>

Loading…
Cancel
Save