From a4e348c3b3b1940e0e5778bf354f1272f88b8e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 13 Feb 2025 09:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E6=B2=A1=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=88=A4=E6=96=AD=E8=A7=84=E5=88=99=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gys_system/controllers/feedback.php   | 12 +++++++++---
 gys_system/models/groupinfo_model.php |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gys_system/controllers/feedback.php b/gys_system/controllers/feedback.php
index 51ce24ab..dbe27b21 100644
--- a/gys_system/controllers/feedback.php
+++ b/gys_system/controllers/feedback.php
@@ -27,8 +27,13 @@ class Feedback extends CI_Controller {
 
     public function checkunback() {
         $data = array();
-        $vei_sn = $this->permission->admin()->LMI_VEI_SN;
-        $check_day_start = date("Y-m-d", strtotime("-6 month"));
+        $passVeiSn = $this->input->get_post("veisn");
+        if (!empty($passVeiSn)){
+            $vei_sn = $this->input->get_post('veisn');
+        } else {
+            $vei_sn = $this->permission->admin()->LMI_VEI_SN;
+        }
+        $check_day_start = date("Y-m-d", strtotime("-3 month"));
         $check_day_end = date("Y-m-d", strtotime("-1 month"));
         $group_list = $this->Groupinfo_model->get_eva_objectinfo(100, false, false, $vei_sn, false, false, null, " EOI_Date between '$check_day_start' and '$check_day_end'  ", ' EOI_Date ASC ');
         if (empty($group_list)) {
@@ -36,7 +41,8 @@ class Feedback extends CI_Controller {
         } else {
             $feedbackstring='';
             foreach ($group_list as $item){
-                $feedbackstring=$feedbackstring."<tr><td>$item->groupname</td><td>$item->EOI_Date</td><td><a href='javascript:void(0);' onclick=\"hideunbackfeed();toweb('/Cooperate/Feedback_Detail.aspx?ESN=$item->EOI_SN&GSN=$item->EOI_GRI_SN','MainBodyFrame');\" >查看</a></td></tr>";          
+                //$feedbackstring=$feedbackstring."<tr><td>$item->groupname</td><td>$item->EOI_Date</td><td><a href='javascript:void(0);' onclick=\"hideunbackfeed();toweb('/Cooperate/Feedback_Detail.aspx?ESN=$item->EOI_SN&GSN=$item->EOI_GRI_SN','MainBodyFrame');\" >查看</a></td></tr>";   
+                $feedbackstring=$feedbackstring."<tr><td>$item->groupname</td><td>$item->EOI_Date</td><td><a href='javascript:void(0);' onclick=\"hideunbackfeed();toweb('/php/gys.php/welcome/feedback_detail/$item->EOI_GRI_SN/$item->EOI_SN','MainBodyFrame');\" >查看</a></td></tr>";             
             }
             $data[] = array('name' => 'yes', 'value' => $feedbackstring);
         }
diff --git a/gys_system/models/groupinfo_model.php b/gys_system/models/groupinfo_model.php
index 9a33ccd0..d996ecc9 100644
--- a/gys_system/models/groupinfo_model.php
+++ b/gys_system/models/groupinfo_model.php
@@ -92,7 +92,11 @@ class Groupinfo_model extends CI_Model {
         empty($eoi_type) ? false : $sql.=' AND EOI_Type= ' . $this->HT->escape($eoi_type);
         empty($eoi_date) ? false : $sql.=' AND ' . $eoi_date;
 		//查找没有添加反馈表的团
-        ($eoi_fillworkers_sn !== null) ? false : $sql.=' AND EOI_FillWorkers_SN IS NULL AND EOI_VerifyUser_SN IS NULL AND (select COUNT(*) from InfoManager.dbo.tga_feedback_evaluation where group_id=EOI_GRI_SN and travel_agency_id=EOI_VEI_SN )=0';
+        //($eoi_fillworkers_sn !== null) ? false : $sql.=' AND EOI_FillWorkers_SN IS NULL AND EOI_VerifyUser_SN IS NULL AND (select COUNT(*) from InfoManager.dbo.tga_feedback_evaluation where group_id=EOI_GRI_SN and travel_agency_id=EOI_VEI_SN )=0';
+        //新判断方式
+        $feedbackSql = " and ( select COUNT(*) from Eva_FrontReception where EFR_GRI_SN=EOI_GRI_SN and EFR_VEI_SN=EOI_VEI_SN )=0
+        and ( select VAS_NewTP from VendorArrangeState where VAS_GRI_SN=EOI_GRI_SN and VAS_VEI_SN=EOI_VEI_SN )=1 ";
+        ($eoi_fillworkers_sn !== null) ? false : $sql.=$feedbackSql ;
 
         $sql.=' ORDER BY ' . $orderby;
         $query = $this->HT->query($sql);