Commit 6d8cfe19 authored by zhuwei's avatar zhuwei

更新

parent 306c1967
......@@ -3059,7 +3059,7 @@ class Finance extends Basic
$export = new ExportExcelUntil();
$title = ['提交时间', '收款ID', '带看ID', '成交报告ID', '入账日期', '提交人', '对应业务员', '所属门店', '类型', '收款金额(元)', '实付金额', '来源', '状态'];
$export->exportTable('收款记录', $excel_data, 14, '收款记录', $title);
$export->exportTable('收款记录', $data, 14, '收款记录', $title);
}
} catch (\Exception $e) {
$msg = '内部错误:' . $e->getMessage();
......
......@@ -112,9 +112,7 @@ class CActivity extends Model
*/
public function updateStatus($activity_id, $status)
{
$result = $this->db_
->where(['id' => $activity_id])
->update(['status' => $status]);
$result = $this->db_->where(['id' => $activity_id])->update(['status' => $status]);
// big_log($this->getLastSql());
return $result;
}
......
......@@ -82,13 +82,13 @@ class UpdateActivityTask
#开始时间大于当时前时间
if( $v['activity_start_time'] > date("Y-m-d H:i:s", time())){
$this->m_active->updateStatus($v['id'],5);
$this->m_active->editorActivity($v['id'],['status' => 5]);
continue;
}
#结束时间小于当时前时间
if( $v['activity_end_time'] < date("Y-m-d H:i:s", time())){
$this->m_active->updateStatus($v['id'],3);
$this->m_active->editorActivity($v['id'],['status' => 3]);
continue;
}
}
......
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