From be51ca155be3eb5a34d9f2a3304a4aa5d8af7d49 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 9 Jun 2025 15:58:54 +0800
Subject: [PATCH] =?UTF-8?q?get=5Ffeedback=5Fby=5Fcity=5Fname,=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BD=E7=B1=8D=E5=92=8C=E5=87=BA=E5=8F=91=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/feedback_model.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php
index d0d72ac6..cac69126 100644
--- a/application/models/feedback_model.php
+++ b/application/models/feedback_model.php
@@ -226,10 +226,15 @@ class Feedback_model extends CI_Model {
       $feedback_query =
         $this->HT->query("
         select top ?
-          tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
+          tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country
         from Eva_TAInfo
             left join Eva_TADetail on TAD_TAI_SN=TAI_SN
             left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
+            left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN
+            left JOIN  ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN
+            left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1
+            left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN
+            left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1
         where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%'
         order by tai_getdate desc",
             array($top, $city_name));
@@ -238,10 +243,15 @@ class Feedback_model extends CI_Model {
         $feedback_query =
           $this->HT->query("
             select top ?
-              tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
+              tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country
             from Eva_TAInfo
                 left join Eva_TADetail on TAD_TAI_SN=TAI_SN
                 left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
+                left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN
+                left JOIN  ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN
+                left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1
+                left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN
+                left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1
             where TAD_Content is not null and vci.cii2_name = ?
             order by tai_getdate desc",
                 array($top, $city_name));
@@ -255,13 +265,18 @@ class Feedback_model extends CI_Model {
         $createdOn = new DateTime($feedback_row->tai_getdate);
         $createdOnString = $createdOn->format('M Y');
 
+        $entranceDate = new DateTime($feedback_row->GRI_EntranceDate);
+        $entranceDateString = $entranceDate->format('M Y');
+
         if (!in_array($feedback_row->tai_customerid, $customer_id_list)) {
           $feedback = [
               'title' => $feedback_row->tai_title,
               'customer' => $feedback_row->tai_customerid,
               'content' => $feedback_row->tad_content,
               'url' => $feedback_row->tai_url,
-              'createdOn' => $createdOnString
+              'createdOn' => $createdOnString,
+              'entranceDate' => $entranceDateString,
+              'nationality' => $feedback_row->COI2_Country
           ];
           $feedback_list[] = $feedback;
           $customer_id_list[] = $feedback_row->tai_customerid;