1

application/api_broker/service/OfficePerformanceService.php

@@ -10,6 +10,7 @@ use app\model\GHousesImgs;
 use app\model\GHousesToAgents;
 use app\model\OBargainModel;
 use app\model\OfficeGRoomToAgent;
+use app\model\OfficeOBargainModel;
 use app\model\OfficeOMarchInModel;
 use app\model\OfficeOPayLogModel;
 use app\model\OfficeORefundModel;
@@ -49,8 +50,9 @@ class OfficePerformanceService
         $this->agentModel      = new AAgents();
         $this->houseModel      = new GHouses();
         $this->userModel       = new Users();
-        $this->bargainModel    = new OBargainModel();
+        $this->bargainModel    = new OfficeOBargainModel();
         $this->reportModel     = new OfficeOReportModel();
+        // $this->reportModel     = new OReportModel();
         $this->marchInModel    = new OfficeOMarchInModel();
         $this->payLogModel     = new OfficeOPayLogModel();
         $this->gHousesImgModel = new GHousesImgs();
@@ -894,7 +896,8 @@ class OfficePerformanceService
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
 
-        $field     = "a.id,a.father_id,a.create_time,a.trade_type,a.scale_fee,a.agent_id,c.internal_address,d.user_phone,d.user_name,b.id as order_id";
+        $field     = "a.id,a.father_id,a.create_time,a.trade_type,a.scale_fee,a.agent_id,e.address as internal_address,
+        d.user_phone,d.user_name,b.id as order_id";
         $list      = $this->bargainModel->getBargainSumList($field, $params, $page_size, $page_no, $request_source_type);
         foreach ($list as $key => $val) {
             $list[$key]['bargain_id']    = $val["father_id"] == 0 ? $val["id"] : $val["father_id"];//成交报告ID

application/index/controller/OfficePerformanceInfo.php

@@ -14,6 +14,7 @@ use app\api_broker\service\VipService;
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
 use app\model\OBargainModel;
+use app\model\OfficeOBargainModel;
 use app\model\OPartialCommission;
 use think\Session;
 
@@ -26,7 +27,7 @@ class OfficePerformanceInfo extends Basic
     public function __construct($request = null)
     {
         parent::__construct($request);
-        $this->oBargainModel = new OBargainModel();
+        $this->oBargainModel = new OfficeOBargainModel();
         $this->status = array('in','10,11,13');
         $this->redis_service = new RedisCacheService();
     }
@@ -107,7 +108,7 @@ class OfficePerformanceInfo extends Basic
             $field .= 'Agent.phone,';
 //            $field .= 'Store.store_name,';
 //            $field .= 'District.district_name,';
-            $field .= 'Houses.internal_address,';
+            $field .= 'Houses.address as internal_address,';
             $field .= 'PartialCommission.practical_fee,';
             $field .= 'Oorder.house_id';
             $return  = $this->oBargainModel->performancelInfo($where,$field,$pageSize,$pageNo);

application/model/OfficeOBargainModel.php

@@ -1400,10 +1400,13 @@ class OfficeOBargainModel extends Model
             ->alias("Obargain")
             ->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left")
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
-            ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
+            ->join("office_g_room Room", "Oorder.house_id    = Room.id", "left")
+            ->join("office_g_building Houses", "Room.building_id = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
-//            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
+
+            //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
 //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
+
             ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
             ->where($where)
             ->order("Obargain.create_time desc")
@@ -1421,7 +1424,8 @@ class OfficeOBargainModel extends Model
             ->alias("Obargain")
             ->join("o_report Oreport", "Obargain.report_id = Oreport.id", "left")
             ->join("o_order Oorder", "Obargain.order_id  = Oorder.id", "left")
-            ->join("g_houses Houses", "Oorder.house_id    = Houses.id", "left")
+            ->join("office_g_room Room", "Oorder.house_id    = Room.id", "left")
+            ->join("office_g_building Houses", "Room.building_id = Houses.id", "left")
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
 //            ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
 //            ->join('a_district District', 'Agent.district_id = District.id', 'left')
@@ -1519,8 +1523,10 @@ class OfficeOBargainModel extends Model
             ->field($field)
             ->alias("a")
             ->join("o_order b", "a.order_id = b.id", "left")
-            ->join("g_houses c", "b.house_id = c.id", "left")
+            ->join("office_g_room c", "b.house_id = c.id", "left")
             ->join("o_report d", "a.report_id = d.id", "left")
+            ->join("office_g_building e", "e.id = c.building_id", "left")
+
             ->where($where_)
             ->limit($page_size)
             ->page($page_no)

application/model/OfficeOReportModel.php

@@ -796,6 +796,60 @@ class OfficeOReportModel extends Model
         return $this->db->where($where)->value($field);
     }
 
+
+    public function getAddReportListPcInfo($params, $field, $page_no, $page_size)
+    {
+        $where_ = [];
+        if (isset($params["agent_id"])) {
+            $where_["a.report_agent_id"] = $params["agent_id"];
+        }
+        if (isset($params["create_time"])) {
+            $where_["a.create_time"] = $params["create_time"];
+        }
+        if (isset($params["house_ids"])) {
+            $where_["b.house_id"] = array( "in", $params["house_ids"] );
+        }
+        $where_["a.status"] = 0;
+        $result             = Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join("o_order b", "a.id = b.f_id", "left")
+            ->join("g_houses c", "b.house_id = c.id", "left")
+            ->join('a_store e', 'a.report_store_id = e.id', 'left')
+
+            ->where($where_)
+            ->limit($page_size)
+            ->page($page_no)
+            ->select();
+        //echo Db::table($this->table)->getLastSql();
+        return $result;
+    }
+
+    public function getAddReportListPcInfoTotal($params, $field)
+    {
+        $where_ = [];
+        if (isset($params["agent_id"])) {
+            $where_["a.report_agent_id"] = $params["agent_id"];
+        }
+        if (isset($params["create_time"])) {
+            $where_["a.create_time"] = $params["create_time"];
+        }
+        if (isset($params["house_ids"])) {
+            $where_["b.house_id"] = array( "in", $params["house_ids"] );
+        }
+        $where_["a.status"] = 0;
+        $result             = Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join("o_order b", "a.id = b.f_id", "left")
+            ->join("g_houses c", "b.house_id = c.id", "left")
+            ->join('a_store e', 'a.report_store_id = e.id', 'left')
+
+            ->where($where_)
+            ->count();
+        //echo Db::table($this->table)->getLastSql();
+        return $result;
+    }
 }