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