From 4a94919d545cb0e92bf39d934f7c34d8288a68a7 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 28 Feb 2024 11:18:40 +0800 Subject: [PATCH 1/3] update --- .../ProjectProgressPaymentLists.php | 3 +++ .../ProjectChangeVisaContentLogic.php | 2 +- .../ProjectProgressPaymentLogic.php | 15 ++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php b/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php index c7393f93b..9fd3cc15b 100644 --- a/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php +++ b/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php @@ -59,6 +59,9 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() + ->each(function($item){ + $item['annex'] = json_decode($item['annex'], true); + }) ->toArray(); } diff --git a/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php b/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php index 908ea0dc8..88fc9e903 100644 --- a/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php @@ -41,7 +41,7 @@ class ProjectChangeVisaContentLogic extends BaseLogic Db::startTrans(); try { ProjectChangeVisaContent::create([ - 'project_change_visa_dataid' => $params['project_change_visa_dataid'], + 'project_progress_payment_id' => $params['project_progress_payment_id'], 'directory' => $params['directory'], 'unit_name' => $params['unit_name'], 'time' => $params['time'], diff --git a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php index a4b2c01bd..4b08b057e 100644 --- a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php @@ -40,7 +40,7 @@ class ProjectProgressPaymentLogic extends BaseLogic { Db::startTrans(); try { - ProjectProgressPayment::create([ + $p = ProjectProgressPayment::create([ 'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'), 'num' => generate_sn(ProjectProgressPayment::class, 'num'), 'project_id' => $params['project_id'], @@ -49,9 +49,12 @@ class ProjectProgressPaymentLogic extends BaseLogic 'sbhj' => $params['sbhj'], 'shhj' => $params['shhj'], 'ljhj' => $params['ljhj'], - 'annex' => $params['annex'], + 'annex' => json_encode($params['annex']) ]); - + foreach ($params['project_progress_payment_detail'] as $item) { + $item['project_progress_payment_id'] = $p->id; + ProjectChangeVisaContentLogic::add($item); + } Db::commit(); return true; } catch (\Exception $e) { @@ -80,7 +83,7 @@ class ProjectProgressPaymentLogic extends BaseLogic 'sbhj' => $params['sbhj'], 'shhj' => $params['shhj'], 'ljhj' => $params['ljhj'], - 'annex' => $params['annex'], + 'annex' => json_encode($params['annex']) ]); Db::commit(); @@ -115,6 +118,8 @@ class ProjectProgressPaymentLogic extends BaseLogic */ public static function detail($params): array { - return ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data = ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data['annex'] = json_decode($data['annex'], true); + return $data; } } \ No newline at end of file From 1aecc6692f8084a92da3106c1b07f78932a5dba9 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 28 Feb 2024 11:21:23 +0800 Subject: [PATCH 2/3] update --- .../ApplyWithSealLists.php | 152 +++++++++--------- .../ApplyWithSealLogic.php | 14 +- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php index 9283bd8b3..9127491f4 100644 --- a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php +++ b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php @@ -1,77 +1,77 @@ - ['num'], - ]; - } - - - /** - * @notes 获取列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/02/23 15:05 - */ - public function lists(): array - { - return ApplyWithSeal::where($this->searchWhere) - ->field(['id', 'dataid', 'num', 'types', 'filetype', 'ridingseam', 'name', 'frequency', 'limit', 'depar', 'stampman', 'project', 'principal', 'content', 'loan', 'borrow', 'returndate', 'applicant', 'date', 'sjborrow', 'sjborrower', 'sjreturn', 'returnee', 'annex']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取数量 - * @return int - * @author likeadmin - * @date 2024/02/23 15:05 - */ - public function count(): int - { - return ApplyWithSeal::where($this->searchWhere)->count(); - } - + ['num'], + + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/23 15:05 + */ + public function lists(): array + { + return ApplyWithSeal::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2024/02/23 15:05 + */ + public function count(): int + { + return ApplyWithSeal::where($this->searchWhere)->count(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php index ea0b4c85c..4e840a832 100644 --- a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php +++ b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php @@ -41,8 +41,8 @@ class ApplyWithSealLogic extends BaseLogic Db::startTrans(); try { ApplyWithSeal::create([ - 'dataid' => $params['dataid'], - 'num' => $params['num'], + 'dataid' => generate_sn(ApplyWithSeal::class, 'dataid'), + 'num' => generate_sn(ApplyWithSeal::class, 'num'), 'types' => $params['types'], 'filetype' => $params['filetype'], 'ridingseam' => $params['ridingseam'], @@ -63,7 +63,7 @@ class ApplyWithSealLogic extends BaseLogic 'sjborrower' => $params['sjborrower'], 'sjreturn' => $params['sjreturn'], 'returnee' => $params['returnee'], - 'annex' => $params['annex'], + 'annex' => json_encode($params['annex']), ]); Db::commit(); @@ -88,8 +88,6 @@ class ApplyWithSealLogic extends BaseLogic Db::startTrans(); try { ApplyWithSeal::where('id', $params['id'])->update([ - 'dataid' => $params['dataid'], - 'num' => $params['num'], 'types' => $params['types'], 'filetype' => $params['filetype'], 'ridingseam' => $params['ridingseam'], @@ -110,7 +108,7 @@ class ApplyWithSealLogic extends BaseLogic 'sjborrower' => $params['sjborrower'], 'sjreturn' => $params['sjreturn'], 'returnee' => $params['returnee'], - 'annex' => $params['annex'], + 'annex' => json_encode($params['annex']) ]); Db::commit(); @@ -145,6 +143,8 @@ class ApplyWithSealLogic extends BaseLogic */ public static function detail($params): array { - return ApplyWithSeal::findOrEmpty($params['id'])->toArray(); + $data = ApplyWithSeal::findOrEmpty($params['id'])->toArray(); + $data['annex'] = json_decode($params['annex'], true); + return $data; } } \ No newline at end of file From 516c1e9f3973cb6b7aeeb522f7f3dfaa538024fb Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Wed, 28 Feb 2024 11:29:03 +0800 Subject: [PATCH 3/3] update --- .../ProjectChangeVisaContentLogic.php | 2 +- .../project_process_management/ProjectChangeVisaLogic.php | 5 ++++- .../ProjectSurveySignatureLogic.php | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php b/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php index 88fc9e903..158900b51 100644 --- a/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php @@ -41,7 +41,7 @@ class ProjectChangeVisaContentLogic extends BaseLogic Db::startTrans(); try { ProjectChangeVisaContent::create([ - 'project_progress_payment_id' => $params['project_progress_payment_id'], + 'project_change_visa_id' => $params['project_change_visa_id'], 'directory' => $params['directory'], 'unit_name' => $params['unit_name'], 'time' => $params['time'], diff --git a/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php b/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php index 3708c608c..b59adf4e7 100644 --- a/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php @@ -17,6 +17,7 @@ namespace app\adminapi\logic\project_process_management; use app\common\model\project_process_management\ProjectChangeVisa; use app\common\logic\BaseLogic; +use app\common\model\project_process_management\ProjectChangeVisaContent; use think\facade\Db; @@ -110,6 +111,8 @@ class ProjectChangeVisaLogic extends BaseLogic */ public static function detail($params): array { - return ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data = ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select(); + return $data; } } \ 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 24d24a40a..3521e5a93 100644 --- a/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php @@ -55,6 +55,7 @@ class ProjectSurveySignatureLogic extends BaseLogic 'content' => $params['content'], 'result' => $params['result'], 'remark' => $params['remark'], + 'annex' => json_encode($params['annex']) ]); Db::commit(); @@ -91,6 +92,7 @@ class ProjectSurveySignatureLogic extends BaseLogic 'content' => $params['content'], 'result' => $params['result'], 'remark' => $params['remark'], + 'annex' => json_encode($params['annex']) ]); Db::commit(); @@ -125,6 +127,8 @@ class ProjectSurveySignatureLogic extends BaseLogic */ public static function detail($params): array { - return ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $data['annex'] = json_decode($data['annex'], true); + return $data; } } \ No newline at end of file