实收明细导出

application/index/controller/OfficeFinance.php

@@ -187,9 +187,9 @@ class OfficeFinance extends Basic
                 $excel_data = [];
                 foreach ($list as $k=>$v) {
                     $agent_data = $s_redis->getRedisCache(2, $v['agent_id']);
-                    $list[$k]['district_store'] = $agent_data['district_name'];
                     $excel_data[$k]['bargain_id'] = $v['bargain_id'];
                     $excel_data[$k]['operation_date'] = $v['operation_date'];
+                    $excel_data[$k]['district_store'] = $agent_data['district_name'];
                     $excel_data[$k]['name'] = $v['name'];
                     $excel_data[$k]['internal_address'] = $v['internal_address'];
                     $excel_data[$k]['house_number'] = $v['house_number'];

application/model/OfficeOPartialCommission.php

@@ -68,11 +68,12 @@ class OfficeOPartialCommission extends BaseModel
      */
     public function totalMoney($where) {
         return $this->alias('a')
-            ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
-            ->join('o_order c', 'b.order_id = c.id', 'left')
-            ->join('g_houses d', 'c.house_id = d.id', 'left')
+            ->join('office_o_bargain b', 'a.bargain_id = b.id', 'left')
+            ->join('office_o_order c', 'b.order_id = c.id', 'left')
+            ->join("office_g_room r", "c.house_id = r.id", "left")
+            ->join("office_g_building s", "r.building_id = s.id", "left")
             ->join('a_agents e', 'b.agent_id = e.id', 'left')
-            ->join('o_real_income f', 'a.real_income_id = f.id', 'left')
+            ->join('office_o_real_income f', 'a.real_income_id = f.id', 'left')
             ->where($where)
             ->sum('a.practical_fee');
     }