From d1c85499ba8aa41170f7340b4d9c17b6181a72e2 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 28 Feb 2024 11:04:31 +0800 Subject: [PATCH] update --- .../ProjectChangeVisaLists.php | 3 ++- .../ProjectSurveySignatureLists.php | 3 ++- .../ProjectChangeVisaLogic.php | 2 +- .../ProjectSurveySignatureLogic.php | 14 +++++--------- .../ProjectChangeVisa.php | 6 +++++- .../ProjectSurveySignature.php | 6 +++++- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php b/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php index 4e6cf946c..c341fd574 100644 --- a/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php +++ b/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php @@ -55,7 +55,8 @@ class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchIn */ public function lists(): array { - return ProjectChangeVisa::where($this->searchWhere) + return ProjectChangeVisa::with(['projectInfo']) + ->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() diff --git a/app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php b/app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php index 5dd6f09db..5baa7073f 100644 --- a/app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php +++ b/app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php @@ -55,7 +55,8 @@ class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSea */ public function lists(): array { - return ProjectSurveySignature::where($this->searchWhere) + return ProjectSurveySignature::with(['projectInfo']) + ->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() diff --git a/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php b/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php index bed0fbd32..3708c608c 100644 --- a/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php @@ -110,6 +110,6 @@ class ProjectChangeVisaLogic extends BaseLogic */ public static function detail($params): array { - return ProjectChangeVisa::findOrEmpty($params['id'])->toArray(); + return ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php b/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php index 383de4892..24d24a40a 100644 --- a/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php @@ -41,10 +41,9 @@ class ProjectSurveySignatureLogic extends BaseLogic Db::startTrans(); try { ProjectSurveySignature::create([ - 'dataid' => $params['dataid'], - 'num' => $params['num'], - 'project' => $params['project'], - 'project_num' => $params['project_num'], + 'dataid' => generate_sn(ProjectSurveySignature::class, 'dataid'), + 'num' => generate_sn(ProjectSurveySignature::class, 'num'), + 'project_id' => $params['project_id'], 'wt_unit' => $params['wt_unit'], 'jsdw' => $params['jsdw'], 'bmfz' => $params['bmfz'], @@ -80,10 +79,7 @@ class ProjectSurveySignatureLogic extends BaseLogic Db::startTrans(); try { ProjectSurveySignature::where('id', $params['id'])->update([ - 'dataid' => $params['dataid'], - 'num' => $params['num'], - 'project' => $params['project'], - 'project_num' => $params['project_num'], + 'project_id' => $params['project_id'], 'wt_unit' => $params['wt_unit'], 'jsdw' => $params['jsdw'], 'bmfz' => $params['bmfz'], @@ -129,6 +125,6 @@ class ProjectSurveySignatureLogic extends BaseLogic */ public static function detail($params): array { - return ProjectSurveySignature::findOrEmpty($params['id'])->toArray(); + return ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); } } \ No newline at end of file diff --git a/app/common/model/project_process_management/ProjectChangeVisa.php b/app/common/model/project_process_management/ProjectChangeVisa.php index 5ff9baec0..92f548f47 100644 --- a/app/common/model/project_process_management/ProjectChangeVisa.php +++ b/app/common/model/project_process_management/ProjectChangeVisa.php @@ -16,6 +16,7 @@ namespace app\common\model\project_process_management; use app\common\model\BaseModel; +use app\common\model\cost_project\CostProject; use think\model\concern\SoftDelete; @@ -30,5 +31,8 @@ class ProjectChangeVisa extends BaseModel protected $name = 'project_change_visa'; protected $deleteTime = 'delete_time'; - + public function projectInfo() + { + return $this->hasOne(CostProject::class, 'id', 'project_id'); + } } \ No newline at end of file diff --git a/app/common/model/project_process_management/ProjectSurveySignature.php b/app/common/model/project_process_management/ProjectSurveySignature.php index 7d2936f4f..e70377c85 100644 --- a/app/common/model/project_process_management/ProjectSurveySignature.php +++ b/app/common/model/project_process_management/ProjectSurveySignature.php @@ -16,6 +16,7 @@ namespace app\common\model\project_process_management; use app\common\model\BaseModel; +use app\common\model\cost_project\CostProject; use think\model\concern\SoftDelete; @@ -30,5 +31,8 @@ class ProjectSurveySignature extends BaseModel protected $name = 'project_survey_signature'; protected $deleteTime = 'delete_time'; - + public function projectInfo() + { + return $this->hasOne(CostProject::class, 'id', 'project_id'); + } } \ No newline at end of file