diff --git a/app/admin/targets/controller/SalesAnnualTargetsController.php b/app/admin/targets/controller/SalesAnnualTargetsController.php index 79eb528..15d6652 100644 --- a/app/admin/targets/controller/SalesAnnualTargetsController.php +++ b/app/admin/targets/controller/SalesAnnualTargetsController.php @@ -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; } } \ No newline at end of file diff --git a/app/admin/targets/controller/SalesMonthlyTargetsController.php b/app/admin/targets/controller/SalesMonthlyTargetsController.php index 3b3ad13..461d503 100644 --- a/app/admin/targets/controller/SalesMonthlyTargetsController.php +++ b/app/admin/targets/controller/SalesMonthlyTargetsController.php @@ -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; } } \ No newline at end of file