From ed5032ad9e40a87ca3a1555a33603a881d5c86ec Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 28 Feb 2024 11:56:48 +0800
Subject: [PATCH] update

---
 .../JianliProjectProgressReportLogic.php                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php b/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
index f54e6750d..1414a136b 100644
--- a/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
+++ b/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
@@ -56,7 +56,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'apptime' => $params['apptime'],
                 'jdms' => $params['jdms'],
-                'datas' => $params['datas'],
+                'annex' => json_encode($params['annex']),
                 'fd_23' => $params['fd_23'],
             ]);
 
@@ -95,7 +95,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'apptime' => $params['apptime'],
                 'jdms' => $params['jdms'],
-                'datas' => $params['datas'],
+                'annex' => json_encode($params['annex']),
                 'fd_23' => $params['fd_23'],
             ]);
 
@@ -131,6 +131,8 @@ class JianliProjectProgressReportLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data = JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }
\ No newline at end of file