From 53d348f1ddd99cb8fe4653b6864092a9df5d2d0b Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 29 Feb 2024 10:01:47 +0800
Subject: [PATCH] update

---
 .../project_process_management/ProjectChangeVisaLists.php   | 6 ++++++
 .../ProjectProgressPaymentLists.php                         | 6 ++++++
 .../ProjectProgressPaymentLogic.php                         | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php b/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php
index c341fd574..e06bb80f9 100644
--- a/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php
+++ b/app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php
@@ -18,6 +18,7 @@ namespace app\adminapi\lists\project_process_management;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\project_process_management\ProjectChangeVisa;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ProjectChangeVisaContent;
 
 
 /**
@@ -56,9 +57,14 @@ class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchIn
     public function lists(): array
     {
         return ProjectChangeVisa::with(['projectInfo'])
+            ->append(['children'])
             ->where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
+            ->withAttr('children', function ($value, $data){
+                $details = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
+                return $details;
+            })
             ->select()
             ->toArray();
     }
diff --git a/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php b/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php
index 9fd3cc15b..924882a12 100644
--- a/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php
+++ b/app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php
@@ -18,6 +18,7 @@ namespace app\adminapi\lists\project_process_management;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\project_process_management\ProjectProgressPayment;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\project_process_management\ProjectProgressPaymentDetail;
 
 
 /**
@@ -56,8 +57,13 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea
     public function lists(): array
     {
         return ProjectProgressPayment::with(['projectInfo'])->where($this->searchWhere)
+            ->append(['children'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
+            ->withAttr('children', function ($value, $data){
+                $details = ProjectProgressPaymentDetail::where('project_progress_payment_id', $data['id'])->select();
+                return $details;
+            })
             ->select()
             ->each(function($item){
                 $item['annex'] = json_decode($item['annex'], true);
diff --git a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php
index 4b08b057e..adca94a28 100644
--- a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php
+++ b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php
@@ -53,7 +53,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
             ]);
             foreach ($params['project_progress_payment_detail'] as $item) {
                 $item['project_progress_payment_id'] = $p->id;
-                ProjectChangeVisaContentLogic::add($item);
+                ProjectProgressPaymentDetailLogic::add($item);
             }
             Db::commit();
             return true;