From e6ea5dfb5a58bb4ae53e84d6442572891efff7df Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 4 Jul 2018 13:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=88=97=E8=BD=A6=E8=BD=A6=E6=AC=A1=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/train/controllers/search.php      |  6 ++++++
 .../train/models/BIZ_intel_train_model.php        | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php
index 1416e5df..60156902 100644
--- a/application/third_party/train/controllers/search.php
+++ b/application/third_party/train/controllers/search.php
@@ -350,6 +350,12 @@ class search extends CI_Controller{
 	    
 	}
 	
+	//获取所有的列车信息
+	public function get_all_inteltrain(){
+		$obj = $this->BIZ_intel_train_model->get_allinteltrain();
+		print_r($obj);
+	}
+	
 	//获取价格(废弃)
 	/*
 	fromStationCode：出发站三字码
diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php
index e9e24cb1..f0d3339d 100644
--- a/application/third_party/train/models/BIZ_intel_train_model.php
+++ b/application/third_party/train/models/BIZ_intel_train_model.php
@@ -80,6 +80,21 @@ class BIZ_intel_train_model extends CI_Model {
         return $query->row();			
 	}
 	
+	public function get_allinteltrain(){
+		$sql = "
+				SELECT 
+						*
+				  FROM
+						TrainStation_intel
+			 LEFT JOIN
+						trainlist
+					ON
+						s_code = trainFromCode
+				";
+		$query = $this->HT->query($sql);
+	    return $query->result();			
+	}
+	
 	public function get_seat_info($seat_code){
 	    $sql = "SELECT Seat_CName,Seat_EName1 FROM TrainSeat_Intel WHERE Seat_Code = '{$seat_code}'";
 	    $query = $this->HT->query($sql);