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] 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