diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index 5cf6de07d..57db3b089 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -26,7 +26,7 @@ use app\common\lists\ListsSearchInterface; * Class CostApprovedProjectLists * @package app\adminapi\listscost_project */ -class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface +class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface { @@ -57,14 +57,15 @@ class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearch public function lists(): array { return CostApprovedProject::where($this->searchWhere) + ->where('status', 1) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select()->each(function($data){ - $data['business_nature_text'] = $data->business_nature_text; - $data['industry_nature_text'] = $data->industry_nature_text; - $data['fund_sources_text'] = $data->fund_sources_text; - $data['const_area_text'] = $data->const_area_text; - }) + ->select()->each(function ($data) { + $data['business_nature_text'] = $data->business_nature_text; + $data['industry_nature_text'] = $data->industry_nature_text; + $data['fund_sources_text'] = $data->fund_sources_text; + $data['const_area_text'] = $data->const_area_text; + }) ->toArray(); } @@ -134,5 +135,4 @@ class CostApprovedProjectLists extends BaseAdminDataLists implements ListsSearch 'number' => '邮寄编号', ]; } - -} \ No newline at end of file +} diff --git a/app/adminapi/logic/cost_project/CostProjectLogic.php b/app/adminapi/logic/cost_project/CostProjectLogic.php index 5f2bd4a64..77816a4b8 100644 --- a/app/adminapi/logic/cost_project/CostProjectLogic.php +++ b/app/adminapi/logic/cost_project/CostProjectLogic.php @@ -19,6 +19,7 @@ use app\common\model\ApprovalIssuanceAchievementDocuments; use app\common\model\cost_project\CostProject; use app\common\logic\BaseLogic; use app\common\model\auth\Admin; +use app\common\model\cost_project\CostApprovedProject; use app\common\model\cost_project\CostProjectPerson; use app\common\model\DataReception; use app\common\model\dept\Dept; @@ -88,6 +89,9 @@ class CostProjectLogic extends BaseLogic 'remark' => $params['remark'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); + if($params['contract_id']>0){ + CostApprovedProject::where('id',$params['contract_id'])->update(['status',2]); + } Db::commit(); return true; } catch (\Exception $e) {