xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/kpi' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-09-18 09:51:01 +08:00
parent c25405832a 9c32ae51db
commit 8fea768e3c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/targets/controller/SalesAnnualTargetsController.php
+5 -1
View File
@@ -32,10 +32,14 @@ class SalesAnnualTargetsController extends BaseController
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['corp_id'])){ if (isset($data['corp_id'])){
$data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name'); $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
$data['corp_name'] = $data['corp_name']??'合塑集团'; // $data['corp_name'] = $data['corp_name']??'合塑集团';
} }
if (isset($data['user_id'])) if (isset($data['user_id']))
$data['user_name'] = User::where('id', $data['user_id'])->value('name'); $data['user_name'] = User::where('id', $data['user_id'])->value('name');
if (empty($data['corp_id']) || empty($data['user_id'])){
$data['user_name'] = '合塑集团';
}
return $data; return $data;
} }
} }
app/admin/targets/service/SalesMonthlyTargetsService.php
+3
View File
@@ -45,6 +45,9 @@ class SalesMonthlyTargetsService
if (isset($p['year']) && $p['year']) { if (isset($p['year']) && $p['year']) {
$config['where']['year'] = $p['year']; $config['where']['year'] = $p['year'];
} }
$config['order']['year'] = 'desc';
$config['order']['user_id'] = 'desc';
$config['order']['month'] = 'asc';
$config['order']['id'] = 'desc'; $config['order']['id'] = 'desc';
break; break;
case 'show': case 'show':