Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
81570431
Commit
81570431
authored
Jun 10, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加字段
parent
9e056357
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
OfficeRoom.php
application/index/controller/OfficeRoom.php
+9
-0
OfficeRoomService.php
application/index/service/OfficeRoomService.php
+2
-2
OfficeACollectHouse.php
application/model/OfficeACollectHouse.php
+1
-1
No files found.
application/index/controller/OfficeRoom.php
View file @
81570431
...
@@ -12,6 +12,7 @@ namespace app\index\controller;
...
@@ -12,6 +12,7 @@ namespace app\index\controller;
use
app\index\extend\Basic
;
use
app\index\extend\Basic
;
use
app\index\service\OfficeRoomService
;
use
app\index\service\OfficeRoomService
;
use
app\index\service\OfficeService
;
use
app\index\service\OfficeService
;
use
app\model\OfficeACollectHouse
;
class
OfficeRoom
extends
Basic
class
OfficeRoom
extends
Basic
{
{
...
@@ -131,6 +132,14 @@ class OfficeRoom extends Basic
...
@@ -131,6 +132,14 @@ class OfficeRoom extends Basic
$result
=
$this
->
service
->
getRoomList
(
$this
->
params
,
1
);
$result
=
$this
->
service
->
getRoomList
(
$this
->
params
,
1
);
if
(
$result
[
'status'
]
==
'successful'
)
{
if
(
$result
[
'status'
]
==
'successful'
)
{
$m_collect
=
new
OfficeACollectHouse
();
foreach
(
$result
[
'data'
]
as
$k
=>
$v
)
{
$where
[
'agents_id'
]
=
$this
->
userId
;
$where
[
'house_id'
]
=
$v
[
'id'
];
$where
[
'status'
]
=
1
;
$is_collect
=
$m_collect
->
getFieldOneValue
(
'id'
,
$where
);
$result
[
'data'
][
$k
][
'is_collect'
]
=
$is_collect
?
$is_collect
:
0
;
}
$data
[
'list'
]
=
$result
[
'data'
];
$data
[
'list'
]
=
$result
[
'data'
];
$data
[
'total'
]
=
$result
[
'total'
];
$data
[
'total'
]
=
$result
[
'total'
];
}
else
{
}
else
{
...
...
application/index/service/OfficeRoomService.php
View file @
81570431
...
@@ -804,7 +804,7 @@ class OfficeRoomService
...
@@ -804,7 +804,7 @@ class OfficeRoomService
/*盘方 start*/
/*盘方 start*/
if
(
$params
[
'dish_id'
]
!=
NULL
)
{
if
(
$params
[
'dish_id'
]
!=
NULL
)
{
$agent_where
[
'a.agent
s
_id'
]
=
$params
[
'dish_id'
];
$agent_where
[
'a.agent_id'
]
=
$params
[
'dish_id'
];
$agent_where
[
'a.type'
]
=
2
;
$agent_where
[
'a.type'
]
=
2
;
$agent_where
[
'a.is_del'
]
=
0
;
$agent_where
[
'a.is_del'
]
=
0
;
}
}
...
@@ -860,7 +860,7 @@ class OfficeRoomService
...
@@ -860,7 +860,7 @@ class OfficeRoomService
}
}
/*房东手机号搜索 end*/
/*房东手机号搜索 end*/
$field
=
'a.id,b.type,b.disc,b.business_district_id,b.title,a.price_total,a.area,a.station_start,a.station_end,'
;
$field
=
'a.id,b.type,b.disc,b.business_district_id,b.title,a.price_total,a.area,a.station_start,a.station_end,'
;
$field
.=
'a.status,a.is_rent,a.is_show,a.create_time,a.floor_tag,a.price,a.building_id'
;
$field
.=
'a.status,a.is_rent,a.is_show,a.create_time,a.floor_tag,a.price,a.building_id
,a.is_carefully_chosen
'
;
$room_data
=
$this
->
m_office_room
->
getRoomAgent
(
$page_no
,
$page_size
,
$field
,
$where
);
$room_data
=
$this
->
m_office_room
->
getRoomAgent
(
$page_no
,
$page_size
,
$field
,
$where
);
$m_business
=
new
GBusinessDistrict
();
$m_business
=
new
GBusinessDistrict
();
...
...
application/model/OfficeACollectHouse.php
View file @
81570431
...
@@ -5,7 +5,7 @@ namespace app\model;
...
@@ -5,7 +5,7 @@ namespace app\model;
use
think\Db
;
use
think\Db
;
use
think\Model
;
use
think\Model
;
class
OfficeACollectHouse
extends
Model
class
OfficeACollectHouse
extends
Base
Model
{
{
// 设置当前模型对应的完整数据表名称
// 设置当前模型对应的完整数据表名称
protected
$table
=
'office_a_collect_house'
;
protected
$table
=
'office_a_collect_house'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment