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

update

Browse Source
This commit is contained in:
weiz 2024-03-18 14:39:57 +08:00
parent d1eb2fe0f5
commit 9d2924d73e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/controller/ProjectCommissionController.php
View File

@ -16,7 +16,6 @@
namespace app\adminapi\controller; namespace app\adminapi\controller;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\ProjectCommissionLists; use app\adminapi\lists\ProjectCommissionLists;
use app\adminapi\logic\ProjectCommissionLogic; use app\adminapi\logic\ProjectCommissionLogic;
use app\adminapi\validate\ProjectCommissionValidate; use app\adminapi\validate\ProjectCommissionValidate;

10
app/adminapi/lists/ProjectCommissionDetailLists.php
View File

@ -14,8 +14,7 @@
namespace app\adminapi\lists; namespace app\adminapi\lists;
use app\common\model\ProjectCommission;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\ProjectCommissionDetail; use app\common\model\ProjectCommissionDetail;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
@ -55,10 +54,13 @@ class ProjectCommissionDetailLists extends BaseAdminDataLists implements ListsSe
public function lists(): array public function lists(): array
{ {
return ProjectCommissionDetail::where($this->searchWhere) return ProjectCommissionDetail::where($this->searchWhere)
->field(['id', 'engineer', 'engineer_id', 'task_name', 'task_type', 'professional_type', 'zj_amount', 'sk_amount', 'tc_rate', 'tc_amount', 'pay_amount']) ->field(['id', 'project_commission_id', 'engineer', 'task_name', 'task_type', 'professional_type', 'zj_amount', 'sk_amount', 'tc_rate', 'tc_amount', 'pay_amount'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function($data){
$project_commission = ProjectCommission::field('num')->where('id',$data['project_commission_id'])->findOrEmpty();
$data['project_commission_num'] = $project_commission['num'];
})
->toArray(); ->toArray();
} }