From ddf25a6ea3553a4049c620b064d301b29bd90b1b Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Fri, 1 Nov 2024 11:12:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=20=E5=88=B0=E6=A3=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 49f4ee9..a213d05 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -25,7 +25,10 @@ class FenzhenController extends Controller { // 这里放 检查是否有 体检引导的数据 $id_number = request('id_number'); - $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->get(); + $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->where('tj_number', '!=', null)->orderBy('id', 'desc')->get(); + if (count($list) == 0) { + $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->orderBy('id', 'desc')->get(); + } return \Yz::Return(true, "弃检成功", ['list' => $list]); } @@ -97,7 +100,7 @@ class FenzhenController extends Controller // $now_time = strtotime('2024-11-07 00:00:00'); if (!!$res['data']['report']) { $report_time = strtotime($res['data']['report'] . ' 00:00:00') + (60 * 60 * 24 * $report_day); - $report_time_show = date('m月d日', $report_time); + $report_time_show = date('m月d日', $report_time); $report_status = false; // 这里补充 获取 出具报告 时间的逻辑 if ($report_time < $now_time) {