1

application/api_broker/service/OfficeReportService.php

@@ -5,6 +5,7 @@ namespace app\api_broker\service;
 use app\api\untils\GeTuiUtils;
 use app\model\GHouses;
 use app\model\GHousesToAgents;
+use app\model\OfficeGRoom;
 use app\model\OfficeOrderModel;
 use app\model\OfficeOReportModel;
 use app\model\Users;
@@ -83,7 +84,7 @@ class OfficeReportService
 
             foreach ($house_arr as $k => $v) {
                 //todo 批量插入到数据库
-                if($v <= 0){
+                if ($v <= 0) {
                     break;
                 }
                 $order_no = $this->createOrderNumber();
@@ -111,7 +112,7 @@ class OfficeReportService
         //如果是店长则获取其下所有的经纪人 这里去掉了for190218
         $vModel = new VerifyService();
         // $agentArr = $vModel->getAgentsByAgentId($params["report_agent_id"]);
-        $params["agent_id_s"]      = array( "in", $params["report_agent_id"] );
+        $params["agent_id_s"] = array("in", $params["report_agent_id"]);
 
         $caseHouseId = $vModel->getCaseHouseIdByAgentIdV2($params["agent_id_s"]);
         $ids         = "";
@@ -137,15 +138,16 @@ class OfficeReportService
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function returnResult($result){
+    public function returnResult($result)
+    {
         $ids_str      = "";
         $house_id_str = "";
         if (count($result) > 0) {
             foreach ($result as $k => $v) {
                 $order_id = 0;
-                if(isset($v["order_id"])){
+                if (isset($v["order_id"])) {
                     $order_id = $v["order_id"];
-                }else{
+                } else {
                     $order_id = $v["id"];
                 }
                 $ids_str      .= $order_id . ",";
@@ -175,6 +177,7 @@ class OfficeReportService
         }
         return $result;
     }
+
     /**
      * 报备订单列表All
      * @param $field
@@ -185,7 +188,7 @@ class OfficeReportService
      * @throws \think\db\exception\BindParamException
      * @throws \think\exception\PDOException
      */
-    public function orderListAll($field, $params, $pageNo, $pageSize,$check_type)
+    public function orderListAll($field, $params, $pageNo, $pageSize, $check_type)
     {
         $vModel = new VerifyService();
         $result = [];
@@ -196,7 +199,7 @@ class OfficeReportService
             case 2 :
             case 3 :
                 $agentArr                  = $vModel->getAgentsByAgentIdAndType($params["report_agent_id"], $check_type);
-                $params["agent_id_s"] = array( "in", $agentArr);
+                $params["agent_id_s"]      = array("in", $agentArr);
                 $params["report_agent_id"] = $agentArr;
                 $caseHouseId               = $vModel->getPanpartyAndExclusiveHouseIdByAgentId($params["agent_id_s"]);
                 $ids                       = "";
@@ -234,7 +237,7 @@ class OfficeReportService
         $vModel   = new VerifyService();
         $agentArr = $vModel->getAgentsByAgentId($params["report_agent_id"]);
         if ($agentArr) {
-            $params["agent_id_s"]      = array( "in", $agentArr );
+            $params["agent_id_s"]      = array("in", $agentArr);
             $params["report_agent_id"] = $agentArr;
         }
 
@@ -251,7 +254,7 @@ class OfficeReportService
         $params["house_ids"] = $ids;
 
         $result = $this->reportModel->selectReportList($field, $params, $pageNo, $pageSize);
-        $count  = $this->reportModel->selectReportCount($field,$params);
+        $count  = $this->reportModel->selectReportCount($field, $params);
 
         if (count($result) > 0) {
             $data["result"] = $this->returnResult($result);
@@ -277,8 +280,8 @@ class OfficeReportService
     public function houseInfo($house_id_str)
     {
         $houseModel   = new GHouses();
-        $params["id"] = array("in",($house_id_str));
-        return $houseModel->getHouseInfo("id,internal_address",$params);
+        $params["id"] = array("in", ($house_id_str));
+        return $houseModel->getHouseInfo("id,internal_address", $params);
     }
 
     public function signTitle($type)
@@ -352,9 +355,9 @@ class OfficeReportService
      */
     private function orderBin($order_no, $f_id, $house_id)
     {
-        $houseModel           = new GHouses();
-        $houseResult          = $houseModel->getHouseDetail("id,internal_title", [ "id" => $house_id ]);
-        $house_title          = count($houseResult) > 0 && isset($houseResult["internal_title"]) ? $houseResult["internal_title"] : null;
+        $roomModel            = new OfficeGRoom();
+        $houseResult          = $roomModel->getHouseDetail("a.id,c.title,c.address,a.room_number", ["id" => $house_id]);
+        $house_title          = count($houseResult) > 0 ? $houseResult["address"] . " " . $houseResult["room_number"] : null;
         $param["order_no"]    = $order_no;
         $param["f_id"]        = $f_id;
         $param["house_id"]    = $house_id;
@@ -373,15 +376,15 @@ class OfficeReportService
     public function getCheckType($agent_id)
     {
         $vip = new VipService();
-        if($vip->vip($agent_id, 'index/inspectionRecordAll/3') == 0){//代表公司
+        if ($vip->vip($agent_id, 'index/inspectionRecordAll/3') == 0) {//代表公司
             return 1;
         }
 
-        if($vip->vip($agent_id, 'index/inspectionRecordDistrict/2') == 0){//代表部门
+        if ($vip->vip($agent_id, 'index/inspectionRecordDistrict/2') == 0) {//代表部门
             return 2;
         }
 
-        if($vip->vip($agent_id, 'index/inspectionRecordStore/1') == 0){//代表门店
+        if ($vip->vip($agent_id, 'index/inspectionRecordStore/1') == 0) {//代表门店
             return 3;
         }
         return 0;

application/model/OfficeGRoom.php

@@ -418,4 +418,22 @@ class OfficeGRoom extends BaseModel
             ->page($pageNo)
             ->select();
     }
+
+    /**
+     * @param $field
+     * @param $params
+     * @return array|false|\PDOStatement|string|\think\Model
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    function getHouseDetail($field, $params)
+    {
+        return $data = $this
+            ->field($field)
+            ->alias("a")
+            ->join("office_g_building b","a.building_id=a.id")
+            ->where($params)
+            ->find();
+    }
 }