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
a546d49b
Commit
a546d49b
authored
Apr 29, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
fe024367
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
SquareService.php
application/api_broker/service/SquareService.php
+8
-1
BSquare.php
application/model/BSquare.php
+1
-1
No files found.
application/api_broker/service/SquareService.php
View file @
a546d49b
...
@@ -206,9 +206,16 @@ class SquareService
...
@@ -206,9 +206,16 @@ class SquareService
$field
.=
'Site.name as site_name,'
;
//城市
$field
.=
'Site.name as site_name,'
;
//城市
$field
.=
'Square.district_lable_id,'
;
//部门
$field
.=
'Square.district_lable_id,'
;
//部门
$field
.=
'Square.create_time'
;
//发布时间
$field
.=
'Square.create_time'
;
//发布时间
$field
.=
'house.external_title as title'
;
$field
.=
'house.shop_area_start'
;
$field
.=
'house.shop_area_end'
;
$field
.=
'house.rent_type'
;
$field
.=
'house.rent_price'
;
$field
.=
'house.shop_sign'
;
$field
.=
'house.industry_type'
;
$get_params
[
'house.status'
]
=
1
;
//上架的商铺
$get_params
[
'Square.id'
]
=
$params
[
'id'
];
$get_params
[
'Square.id'
]
=
$params
[
'id'
];
// $get_params['Square.status'] = 0;
$res
=
$this
->
m_square
->
getSquareInfo
(
$field
,
$get_params
);
$res
=
$this
->
m_square
->
getSquareInfo
(
$field
,
$get_params
);
$res
[
'district_lable_name'
]
=
$this
->
getDistrictLableName
(
$res
[
'district_lable_id'
]);
$res
[
'district_lable_name'
]
=
$this
->
getDistrictLableName
(
$res
[
'district_lable_id'
]);
...
...
application/model/BSquare.php
View file @
a546d49b
...
@@ -69,7 +69,7 @@ class BSquare extends Model
...
@@ -69,7 +69,7 @@ class BSquare extends Model
->
field
(
$field
)
->
field
(
$field
)
->
alias
(
'Square'
)
->
alias
(
'Square'
)
->
join
(
'a_site Site'
,
'Site.id = Square.site_id'
,
'left'
)
->
join
(
'a_site Site'
,
'Site.id = Square.site_id'
,
'left'
)
// ->join('a_district District', 'District.id = Square.district
_id', 'left')
->
join
(
'g_houses house'
,
'house.id = Square.house
_id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order
)
->
order
(
$order
)
->
find
();
->
find
();
...
...
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