diff --git a/app/adminapi/logic/DataReceptionLogic.php b/app/adminapi/logic/DataReceptionLogic.php index 6a1263583..8642cfd52 100644 --- a/app/adminapi/logic/DataReceptionLogic.php +++ b/app/adminapi/logic/DataReceptionLogic.php @@ -49,13 +49,13 @@ class DataReceptionLogic extends BaseLogic 'number' => $params['number'], 'position' => $params['position'], 'tips' => $params['tips'], - 'bidding_file' => json_encode($params['bidding_file']), - 'zbkzj_file' => json_encode($params['zbkzj_file']), - 'gczjht_file' => json_encode($params['gczjht_file']), - 'xmbgqzzl_file' => json_encode($params['xmbgqzzl_file']), - 'ssgsysjs_file' => json_encode($params['ssgsysjs_file']), - 'wlhj_file' => json_encode($params['wlhj_file']), - 'other_file' => json_encode($params['other_file']), + 'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null, + 'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null, + 'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null, + 'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null, + 'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null, + 'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null, + 'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null, ]); Db::commit(); @@ -86,13 +86,13 @@ class DataReceptionLogic extends BaseLogic 'number' => $params['number'], 'position' => $params['position'], 'tips' => $params['tips'], - 'bidding_file' => json_encode($params['bidding_file']), - 'zbkzj_file' => json_encode($params['zbkzj_file']), - 'gczjht_file' => json_encode($params['gczjht_file']), - 'xmbgqzzl_file' => json_encode($params['xmbgqzzl_file']), - 'ssgsysjs_file' => json_encode($params['ssgsysjs_file']), - 'wlhj_file' => json_encode($params['wlhj_file']), - 'other_file' => json_encode($params['other_file']), + 'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null, + 'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null, + 'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null, + 'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null, + 'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null, + 'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null, + 'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null, ]); Db::commit(); @@ -128,13 +128,13 @@ class DataReceptionLogic extends BaseLogic public static function detail($params): array { $data = DataReception::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['bidding_file'] = json_decode($data['bidding_file'], true); - $data['zbkzj_file'] = json_decode($data['zbkzj_file'], true); - $data['gczjht_file'] = json_decode($data['gczjht_file'], true); - $data['xmbgqzzl_file'] = json_decode($data['xmbgqzzl_file'], true); - $data['ssgsysjs_file'] = json_decode($data['ssgsysjs_file'], true); - $data['wlhj_file'] = json_decode($data['wlhj_file'], true); - $data['other_file'] = json_decode($data['other_file'], true); + $data['bidding_file'] = !empty($data['bidding_file']) ? json_decode($data['bidding_file'], true) : ''; + $data['zbkzj_file'] = !empty($data['zbkzj_file']) ? json_decode($data['zbkzj_file'], true) : ''; + $data['gczjht_file'] = !empty($data['gczjht_file']) ? json_decode($data['gczjht_file'], true) : ''; + $data['xmbgqzzl_file'] = !empty($data['xmbgqzzl_file']) ? json_decode($data['xmbgqzzl_file'], true) : ''; + $data['ssgsysjs_file'] = !empty($data['ssgsysjs_file']) ? json_decode($data['ssgsysjs_file'], true) : ''; + $data['wlhj_file'] = !empty($data['wlhj_file']) ? json_decode($data['wlhj_file'], true) : ''; + $data['other_file'] = !empty($data['other_file']) ? json_decode($data['other_file'], true) : ''; return $data; } } \ 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 d390424df..180975507 100644 --- a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php +++ b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php @@ -63,7 +63,7 @@ class ApplyWithSealLogic extends BaseLogic 'sjborrower' => $params['sjborrower'], 'sjreturn' => $params['sjreturn'], 'returnee' => $params['returnee'], - 'annex' => json_encode($params['annex']), + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); @@ -108,7 +108,7 @@ class ApplyWithSealLogic extends BaseLogic 'sjborrower' => $params['sjborrower'], 'sjreturn' => $params['sjreturn'], 'returnee' => $params['returnee'], - 'annex' => json_encode($params['annex']) + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); @@ -144,7 +144,6 @@ class ApplyWithSealLogic extends BaseLogic public static function detail($params): array { $data = ApplyWithSeal::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['annex'] = json_decode($data['annex'], true); return $data; } } \ No newline at end of file diff --git a/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php b/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php index 1414a136b..84efe8743 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'], - 'annex' => json_encode($params['annex']), + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'fd_23' => $params['fd_23'], ]); @@ -95,7 +95,7 @@ class JianliProjectProgressReportLogic extends BaseLogic 'djr' => $params['djr'], 'apptime' => $params['apptime'], 'jdms' => $params['jdms'], - 'annex' => json_encode($params['annex']), + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'fd_23' => $params['fd_23'], ]); @@ -132,7 +132,6 @@ class JianliProjectProgressReportLogic extends BaseLogic public static function detail($params): array { $data = JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['annex'] = json_decode($data['annex'], true); return $data; } } \ No newline at end of file diff --git a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php index c61df7228..4900bf5fe 100644 --- a/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php @@ -50,7 +50,7 @@ class ProjectProgressPaymentLogic extends BaseLogic 'sbhj' => $params['sbhj'], 'shhj' => $params['shhj'], 'ljhj' => $params['ljhj'], - 'annex' => json_encode($params['annex']) + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); foreach ($params['project_progress_payment_detail'] as $item) { $item['project_progress_payment_id'] = $p->id; @@ -84,7 +84,7 @@ class ProjectProgressPaymentLogic extends BaseLogic 'sbhj' => $params['sbhj'], 'shhj' => $params['shhj'], 'ljhj' => $params['ljhj'], - 'annex' => json_encode($params['annex']) + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); @@ -120,7 +120,6 @@ class ProjectProgressPaymentLogic extends BaseLogic public static function detail($params): array { $data = ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['annex'] = json_decode($data['annex'], true); $data['project_progress_payment_detail'] = ProjectProgressPaymentDetail::where('project_progress_payment_id', $data['id'])->select(); return $data; } diff --git a/app/adminapi/logic/project_process_management/ProjectRectificationLogic.php b/app/adminapi/logic/project_process_management/ProjectRectificationLogic.php index 426fc5d27..fb6637c15 100644 --- a/app/adminapi/logic/project_process_management/ProjectRectificationLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectRectificationLogic.php @@ -53,7 +53,7 @@ class ProjectRectificationLogic extends BaseLogic 'problem' => $params['problem'], 'deal_desc' => $params['deal_desc'], 'remark' => $params['remark'], - 'annex' => $params['annex'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); @@ -88,7 +88,7 @@ class ProjectRectificationLogic extends BaseLogic 'problem' => $params['problem'], 'deal_desc' => $params['deal_desc'], 'remark' => $params['remark'], - 'annex' => $params['annex'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); Db::commit(); diff --git a/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php b/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php index 3521e5a93..90ed9aeb2 100644 --- a/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php +++ b/app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php @@ -55,7 +55,7 @@ class ProjectSurveySignatureLogic extends BaseLogic 'content' => $params['content'], 'result' => $params['result'], 'remark' => $params['remark'], - 'annex' => json_encode($params['annex']) + 'annex' => $params['annex'] ? json_encode($params['annex']) : null ]); Db::commit(); @@ -92,7 +92,7 @@ class ProjectSurveySignatureLogic extends BaseLogic 'content' => $params['content'], 'result' => $params['result'], 'remark' => $params['remark'], - 'annex' => json_encode($params['annex']) + 'annex' => $params['annex'] ? json_encode($params['annex']) : null ]); Db::commit(); @@ -128,7 +128,6 @@ class ProjectSurveySignatureLogic extends BaseLogic public static function detail($params): array { $data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); - $data['annex'] = json_decode($data['annex'], true); return $data; } } \ No newline at end of file