Commit 66297e02 authored by hujun's avatar hujun

count

parent 48e40c09
...@@ -14,6 +14,7 @@ use app\api_broker\service\RedisCacheService; ...@@ -14,6 +14,7 @@ use app\api_broker\service\RedisCacheService;
use app\index\extend\Basic; use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil; use app\index\untils\ExportExcelUntil;
use app\model\GHouses; use app\model\GHouses;
use app\model\ODaily;
use app\model\OImg; use app\model\OImg;
use app\model\OPayLogModel; use app\model\OPayLogModel;
use app\model\OPayLogOpen; use app\model\OPayLogOpen;
...@@ -174,6 +175,7 @@ class PayLogOpen extends Basic ...@@ -174,6 +175,7 @@ class PayLogOpen extends Basic
if ($this->params['excel'] == 0) { if ($this->params['excel'] == 0) {
$m_pay = new OPayLogModel(); $m_pay = new OPayLogModel();
$m_store = new AStore(); $m_store = new AStore();
$m_daily = new ODaily();
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
$log_where['open_id'] = $v['id']; $log_where['open_id'] = $v['id'];
$log_where['is_del'] = 0; $log_where['is_del'] = 0;
...@@ -188,14 +190,15 @@ class PayLogOpen extends Basic ...@@ -188,14 +190,15 @@ class PayLogOpen extends Basic
$list[$k]['check_time'] = ''; $list[$k]['check_time'] = '';
} }
$list[$k]['agent_name'] = $v['name']; $list[$k]['agent_name'] = $v['name'];
//跳转财务日报页面数据 //跳转财务日报页面数据
$pay_data = $m_pay->getPayLogByUserId('b.report_store_id,a.create_time', ['id'=>$v['pay_log_id']]); $pay_data = $m_pay->getPayLogByUserId('b.report_store_id,a.create_time', ['id'=>$v['pay_log_id']]);
if ($pay_data) { $daily_where['store_id'] = $pay_data['report_store_id'];
$daily_where['daily_date'] = date('Y-m-d', strtotime($pay_data['create_time']));
$num = $m_daily->getTotal($daily_where); //是否提交财务日报
if ($num) {
$list[$k]['daily_date'] = date('Y-m-d', strtotime($pay_data['create_time'])); $list[$k]['daily_date'] = date('Y-m-d', strtotime($pay_data['create_time']));
$list[$k]['store_id'] = $pay_data['report_store_id']; $list[$k]['store_id'] = $pay_data['report_store_id'];
$list[$k]['store_name'] = $m_store->getStoreKeyById('store_name', ['id'=>$pay_data['report_store_id']]); $list[$k]['store_name'] = $m_store->getStoreKeyById('store_name', ['id'=>$pay_data['report_store_id']]);
} else { } else {
$list[$k]['daily_date'] = ''; $list[$k]['daily_date'] = '';
$list[$k]['store_id'] = ''; $list[$k]['store_id'] = '';
......
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