mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复错误

Browse Source
This commit is contained in:
mkm 2023-08-03 16:02:36 +08:00
parent 317e9bf8bf
commit 60fc4f00b9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/controller/AccountLogController.php
View File

@ -38,11 +38,18 @@ class AccountLogController extends BaseApiController
//个人月份统计 //个人月份统计
public function year_count() public function year_count()
{ {
$params=$this->request->param();
$data = [['month' => date('Y') . '-01'], ['month' => date('Y') . '-02'], ['month' => date('Y') . '-03'], ['month' => date('Y') . '-04'], ['month' => date('Y') . '-05'], ['month' => date('Y') . '-06'], ['month' => date('Y') . '-07'], ['month' => date('Y') . '-08'], ['month' => date('Y') . '-09'], ['month' => date('Y') . '-10'], ['month' => date('Y') . '-11'], ['month' => date('Y') . '-12']]; $data = [['month' => date('Y') . '-01'], ['month' => date('Y') . '-02'], ['month' => date('Y') . '-03'], ['month' => date('Y') . '-04'], ['month' => date('Y') . '-05'], ['month' => date('Y') . '-06'], ['month' => date('Y') . '-07'], ['month' => date('Y') . '-08'], ['month' => date('Y') . '-09'], ['month' => date('Y') . '-10'], ['month' => date('Y') . '-11'], ['month' => date('Y') . '-12']];
$year = date('Y'); $year = date('Y');
if(isset($params['user_id']) && $params['user_id'] > 0){
$where[] =['user_id','=', $params['user_id']];
}else{
$where[] = ['user_id', '=', $this->userId];
}
$change_amount_1 = Db::name('user_account_log') $change_amount_1 = Db::name('user_account_log')
->whereYear('create_time', $year) ->whereYear('create_time', $year)
->where('action', 1) ->where('action', 1)
->where($where)
->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total') ->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total')
->group('month') ->group('month')
->order('month') ->order('month')
@ -50,6 +57,8 @@ class AccountLogController extends BaseApiController
$change_amount_2 = Db::name('user_account_log') $change_amount_2 = Db::name('user_account_log')
->whereYear('create_time', $year) ->whereYear('create_time', $year)
->where('action', 2) ->where('action', 2)
->where($where)
->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total') ->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total')
->group('month') ->group('month')
->order('month') ->order('month')