From aeb29564997dec6cb5476899754c09d99cf4c6c3 Mon Sep 17 00:00:00 2001 From: LEE Wei Cheng Date: Sat, 7 Oct 2023 16:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Ticket=5FType=E5=8F=AF?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=9F=A5=E8=A9=A2+=E9=80=B2=E5=87=BA?= =?UTF-8?q?=E6=9F=A5=E8=A9=A2=E6=8C=87=E4=BB=A4=E9=81=8E=E6=96=BC=E5=90=83?= =?UTF-8?q?=E6=95=88=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/Carpark_model.php | 14 +++++++++++++- models/Carpayment_model.php | 11 ++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/models/Carpark_model.php b/models/Carpark_model.php index b58bd05..ad4cb8b 100644 --- a/models/Carpark_model.php +++ b/models/Carpark_model.php @@ -118,7 +118,7 @@ class Carpark_model extends CI_Model ->get() ->result_array(); */ - $sql = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order + $sql1 = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order from cario c left join members m on c.obj_id = m.lpr where c.err = 0 and c.out_time is null) union @@ -126,6 +126,18 @@ class Carpark_model extends CI_Model from cario c left join members m on c.obj_id = m.lpr where c.err = 0 and c.out_time is not null) order by time_order desc limit 10;'; + + $sql = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order + from cario c left join members m on c.obj_id = m.lpr + where c.err = 0 and c.out_time is null + order by time_order desc limit 10) + union + (select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.out_time as time_order + from cario c left join members m on c.obj_id = m.lpr + where c.err = 0 and c.out_time is not null + order by time_order desc limit 10) + order by time_order desc limit 10;'; + $data_cario = $this->db->query($sql)->result_array(); // $lane_arr = array(0 => '入1', 1 => '入2', 3 => '出3', 3 => '出4'); diff --git a/models/Carpayment_model.php b/models/Carpayment_model.php index 58eb416..4714c71 100644 --- a/models/Carpayment_model.php +++ b/models/Carpayment_model.php @@ -528,7 +528,7 @@ class Carpayment_model extends CI_Model $data['end_time'] = '00:00'; } - $result = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no") + $result_bak = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no") ->from('cario') //->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0)) ->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0, 'ticket_type' => 0)) // 20180130 刷卡進的跳過 @@ -536,6 +536,15 @@ class Carpayment_model extends CI_Model ->limit(1) ->get() ->row_array(); + + $result = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no") + ->from('cario') + //->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0)) + ->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0)) + ->order_by('cario_no', 'desc') + ->limit(1) + ->get() + ->row_array(); if (!empty($result['in_time'])) {