From b6a003c4c4a9ea216807f6952bf7e915cdd2c8ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 17 Oct 2024 17:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E7=AB=99=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=AC=AC=E5=85=AD=E4=B8=AA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gys_system/controllers/welcome.php    |  4 ++++
 gys_system/models/groupinfo_model.php | 22 ++++++++++++++++++++++
 gys_system/views/feedback_detail.php  | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/gys_system/controllers/welcome.php b/gys_system/controllers/welcome.php
index 847e8b0b..8b6e71e0 100644
--- a/gys_system/controllers/welcome.php
+++ b/gys_system/controllers/welcome.php
@@ -74,12 +74,16 @@ class Welcome extends CI_Controller {
         $data['group_service'] = $this->Groupinfo_model->get_group_service($eoi_sn, $vei_sn);//执行两次，第一次可能因为数据没有建立
         $data['service_question_four'] = $this->Groupinfo_model->get_eva_feedback($gri_sn, $vei_sn, $eoi_sn, $data['group_service']->QSFour);
         $data['service_question_five'] = $this->Groupinfo_model->get_eva_feedback($gri_sn, $vei_sn, $eoi_sn, $data['group_service']->QSFive);
+        $data['service_question_six'] = $this->Groupinfo_model->get_eva_feedback($gri_sn, $vei_sn, $eoi_sn, '223016'); //第六个问题 20241017 zp
         //问题6
         $data['other_service_question'] = $this->Groupinfo_model->get_eva_feedback($gri_sn, $vei_sn, $eoi_sn, 223012);
 
         //判断是否已经由小助手那边提交了反馈数据
         $data['CheckXzsSubmit'] = $this->Groupinfo_model->CheckXzsSubmit($gri_sn,$vei_sn);
 
+        //判断是否是最后一站城市
+        $data['CheckLastCity'] = $this->Groupinfo_model->CheckLastCity($gri_sn,$vei_sn);
+
         $this->load->view('header', $data);
         $this->load->view('feedback_detail');
         $this->load->view('footer');
diff --git a/gys_system/models/groupinfo_model.php b/gys_system/models/groupinfo_model.php
index 090c966a..dc00315e 100644
--- a/gys_system/models/groupinfo_model.php
+++ b/gys_system/models/groupinfo_model.php
@@ -427,4 +427,26 @@ class Groupinfo_model extends CI_Model {
 
     }
 
+    //判断企业是否是最后一站城市
+    function CheckLastCity($gri_sn,$vei_sn){
+        $sql = "select 1 where ?=(select top 1 ACI_VEI_SN 
+        from ArrangeConfirmInfo
+         where ACI_GRI_SN=?
+         and ACI_ServiceType in ('6','7','8','D') 
+         and ACI_VEI_SN>0 
+         order by ACI_DayNo desc)";
+        
+        //  echo ($sql.",".$gri_sn.",".$vei_sn);
+
+         $query = $this->HT->query($sql,array($vei_sn,$gri_sn));
+         if ($query->num_rows() > 0){
+           $result = true;
+         }else{
+            $result = false;
+         }
+        
+         return $result;
+
+    }
+
 }
diff --git a/gys_system/views/feedback_detail.php b/gys_system/views/feedback_detail.php
index 706d64a2..153db2b8 100644
--- a/gys_system/views/feedback_detail.php
+++ b/gys_system/views/feedback_detail.php
@@ -236,7 +236,22 @@
 
                     </div>
                 </div>
+                
+                <?php  if ($CheckLastCity){ //20241017 新增第六问题  zp ?>
+
+                <div class="row">
+                    <div class="col-md-24">
+                        <h3>6.Where is your desired destination for your next trip?</h3>
+                        <input type="hidden" name="q6_eef_type" value="223016" />  
+                        <div class="row">
+                            <div class="col-md-24">
+                                <textarea class="col-md-20" rows="3" name="q6_eef_content"><?php echo empty($service_question_six)?false:$service_question_six->EEF_Content; ?></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
 
+                <?php } ?>
 
                 <?php
                     if (1==2) { // 2019-6-24 暂时不需要