Merge branch 'feature/kpi' into develop

2025-09-16 18:09:22 +08:00
parent 5b4842d6e8 2c1e4e35f3
commit 981a71708c
2 changed files with 15 additions and 0 deletions
@@ -2,6 +2,8 @@
 namespace app\admin\targets\controller;

 use app\common\controller\BaseController;
+use app\common\model\Corp;
+use app\common\model\User;
 use app\common\traits\crud\CrudControllerTrait;
 use app\admin\targets\service\SalesAnnualTargetsService;

@@ -28,6 +30,12 @@ class SalesAnnualTargetsController extends BaseController
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         if (isset($data['corp_id'])){
+             $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
+             $data['corp_name'] = $data['corp_name']??'合塑集团';
+         }
+         if (isset($data['user_id']))
+             $data['user_name'] = User::where('id', $data['user_id'])->value('name');
         return $data;
     }
 }
@@ -2,6 +2,8 @@
 namespace app\admin\targets\controller;

 use app\common\controller\BaseController;
+use app\common\model\Corp;
+use app\common\model\User;
 use app\common\traits\crud\CrudControllerTrait;
 use app\admin\targets\service\SalesMonthlyTargetsService;

@@ -28,6 +30,11 @@ class SalesMonthlyTargetsController extends BaseController
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         if (isset($data['corp_id']))
+             $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
+         if (isset($data['user_id']))
+             $data['user_name'] = User::where('id', $data['user_id'])->value('name');
+
         return $data;
     }
 }