修改 前端状态跟踪bug

html/application/controllers/admin/report.php

@@ -118,7 +118,6 @@ class Report extends CI_Controller
 
 		$this->data['count'] = $count;
         $customers =  $this->customer_building->get_report_list($where, $page_no, self::PAGE_SIZE);
-
 				// echo '<pre>';
 				// print_r($customers);die;
         if ($customers) {
@@ -139,14 +138,13 @@ class Report extends CI_Controller
 
 
         $this->data['recommend_status'] = $this->_status;
-
         //获取分页
         $this->data['num_link'] = set_page_new($data_arr,$this,site_url('admin/report/index'),$count,self::PAGE_SIZE,4,'',true);
 
 
         $this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE  + 1;
         $this->data['managers'] = $this->manager->get_manager_name();
-
+        
 		$this->load->view('admin/report/index_info',$this->data);
 	}
 
@@ -1251,7 +1249,7 @@ class Report extends CI_Controller
 		$count = $this->customer_building->get_report_count($where);
 
 		$this->data['count'] = $count;
-        $customers =  $this->customer_building->get_report_list($where, $page_no, self::PAGE_SIZE);
+        //$customers =  $this->customer_building->get_report_list($where, $page_no, self::PAGE_SIZE);
         $customers = $this->customer_building->get_reportagain_list($where, $page_no, self::PAGE_SIZE);
 
         $this->data['customers'] = $customers;

html/application/models/customer_building_model.php

@@ -138,7 +138,7 @@ class Customer_building_model extends MY_Model{
     public function get_report_list($where = '', $page = 1, $page_size = 10, $order = NULL)
     {
         $this->db->distinct()
-						->select('D.company_name,CB.customer_id,C.customer_user,C.customer_mobile,C.customer_idcard,CB.create_time,CB.is_valid,CB.remark,CB.id,CB.assign_time,CB.building_id,C.customer_type,CB.recommend_status,UP.user_name sale_name,UP.true_name Strue_name,TU.true_name Mtrue_name,TU.user_name manager_name,B.building_title,U.user_name agent_name,CB.report_status,CB.report_time,TM.manager_name channel_name')
+						->select('D.company_name,CB.customer_id,C.customer_user,C.customer_mobile,C.customer_idcard,CB.create_time,CB.is_valid,CB.remark,CB.id,CB.assign_time,CB.building_id,C.customer_type,CB.recommend_status,UP.user_name sale_name,UP.true_name Strue_name,TU.true_name Mtrue_name,TU.user_name manager_name,B.building_title,U.user_name agent_name,CB.report_status,CB.report_time,TM.manager_name channel_name,CB.is_expired expired')
             ->from('tb_customer_building CB')
             ->join('tb_building B', 'B.id = CB.building_id ', 'left')
             ->join('tb_customer C', 'C.id = CB.customer_id ', 'left')
@@ -172,7 +172,7 @@ class Customer_building_model extends MY_Model{
     //二次报备列表
      public function get_reportagain_list($where = '', $page = 1, $page_size = 10, $order = NULL)
     {
-        $this->db->select('D.company_name,CB.report_time,CB.customer_id,C.customer_user,C.customer_mobile,C.customer_idcard,CB.create_time,CB.is_valid,CB.remark,CB.id,CB.assign_time,CB.building_id,C.customer_type,CB.recommend_status,UP.user_name sale_name,UP.true_name Strue_name,TU.true_name Mtrue_name,TU.user_name manager_name,B.building_title,U.user_name agent_name,CB.report_status,CB.report_time,TM.manager_name channel_name')
+        $this->db->select('D.company_name,CB.report_time,CB.customer_id,C.customer_user,C.customer_mobile,C.customer_idcard,CB.create_time,CB.is_valid,CB.remark,CB.id,CB.assign_time,CB.building_id,C.customer_type,CB.recommend_status,UP.user_name sale_name,UP.true_name Strue_name,TU.true_name Mtrue_name,TU.user_name manager_name,B.building_title,U.user_name agent_name,CB.report_status,CB.report_time,TM.manager_name channel_name,CB.is_expired expired')
             ->from('tb_customer_building CB')
             ->join('tb_building B', 'B.id = CB.building_id ', 'left')
             ->join('tb_customer C', 'C.id = CB.customer_id ', 'left')

html/application/views/admin/report/index_info.php

@@ -223,6 +223,7 @@
 										} ?>
 
 									  </div>
+									  
 									  <div style='margin-top:5px;'></div>
                                     <button type="submit" class="btn blue" id="search">搜索</button>
 
@@ -270,7 +271,11 @@
 									<td><?php echo $customer_type[$customer['customer_type']]; ?></td>
 									<td><?php echo date('Y-m-d H:i',$customer['create_time']);?></td>
 									<td><?php echo $customer['assign_time'] ? date('Y-m-d H:i',$customer['assign_time']) : '';?></td>
+									<?php if($customer['expired']==0){?>
 									<td><?php echo $recommend_status[$customer['recommend_status']]; ?></td>
+									<?php }else{?>
+									<td>已过期</td>
+									<?php }?>
 									<td><?php echo $customer['Strue_name'];?></td>
 									<td><?php echo $customer['Mtrue_name'];?></td>
 									<td><?php echo $customer['agent_name'];?></td>

html/application/views/admin/report/report_again.php

@@ -153,7 +153,11 @@
 									<td><?php echo $customer_type[$customer['customer_type']]; ?></td>
 									<td><?php echo date('Y-m-d H:i',$customer['create_time']);?></td>
 									<td><?php echo date('Y-m-d H:i',$customer['report_time']);?></td>
+									<?php if($customer['expired']==0){?>
 									<td><?php echo $recommend_status[$customer['recommend_status']]; ?></td>
+									<?php }else{?>
+									<td>已过期</td>
+									<?php }?>
 									<td><?php echo $customer['Strue_name'];?></td>
 									<td><?php echo $customer['Mtrue_name'];?></td>
 									<td><?php echo $customer['agent_name'];?></td>