修改二次报备页面跳转

html/application/controllers/admin/report.php

@@ -1243,7 +1243,7 @@ class Report extends CI_Controller
 		$this->data['con_arr'] = $con_arr;
 		$where = $this->_search($con_arr);
 
-		$where .= " and CB.report_status != 'NEVER' and CB.recommend_status != 8 ";
+		$where .= " and CB.report_time <> 0 ";
 
 		$count = $this->customer_building->get_report_count($where);
 

html/application/models/customer_building_model.php

@@ -183,9 +183,12 @@ class Customer_building_model extends MY_Model{
             ->join('tb_channel CC', 'CC.id=D.channel_id', 'left')
             ->join('tb_manager TM', 'TM.id=CC.manager_id', 'left')
             ->join('tb_building_distributor_relate RR','RR.building_id=CB.building_id AND D.id=RR.distributor_id', 'left')
-            ->join('tb_manager M','RR.user_id=M.id', 'left')
-            ->where('CB.report_time <> 0');
+            ->join('tb_manager M','RR.user_id=M.id', 'left');
+				if(!empty($where))
+				{
+						$this->db->where($where);
 
+				}
         $this->db->order_by('CB.id','desc');
 
         $query = $this->db->get(null,$page_size, ($page-1) * $page_size);

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

@@ -170,7 +170,7 @@
 								<form action="<?php echo site_url('admin/report/index');?>" name='form' method="get" style="padding-left:5px;">
 									<input type="hidden" id="data_type" name="data_type" value="<?php echo $con_arr['data_type']; ?>">
 									项目名称：
-                                     <input type="text"  class="form-control input-inline input-small" name=" project_name"  value="<?php echo $con_arr['project_name'];?>">
+                                     <input type="text"  class="form-control input-inline input-small" name="project_name"  value="<?php echo $con_arr['project_name'];?>">
 
 
 									客户姓名：

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

@@ -81,7 +81,7 @@
                         <div class="portlet-body clearfix">
                             <div class="form-body" style="padding:0">
                                 <div style="padding-left:5px;margin-bottom: 20px;background: #F9FCEF;padding: 10px 0;border: 1px solid #ccc;" class="text-left">
-								<form action="<?php echo site_url('admin/report/index');?>" name='form' method="get" style="padding-left:5px;">
+								<form action="<?php echo site_url('admin/report/reportAgain');?>" name='form' method="get" style="padding-left:5px;">
 									<input type="hidden" id="data_type" name="data_type" value="<?php echo $con_arr['data_type']; ?>">
 									分销商名称：
                                      <input type="text" class="form-control input-inline input-small" name="company_name"  value="<?php echo $con_arr['company_name'];?>">