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
3994d3b3
Commit
3994d3b3
authored
Aug 10, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
9e33a220
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
PerformanceInfo.php
application/index/controller/PerformanceInfo.php
+2
-1
No files found.
application/index/controller/PerformanceInfo.php
View file @
3994d3b3
...
@@ -35,7 +35,7 @@ class PerformanceInfo extends Basic
...
@@ -35,7 +35,7 @@ class PerformanceInfo extends Basic
$where
=
[];
$where
=
[];
/*开始结束时间*/
/*开始结束时间*/
if
((
$this
->
params
[
'create_time_start'
]
!=
NULL
)
&&
(
$this
->
params
[
'create_time_end'
]
!=
NULL
))
{
if
((
$this
->
params
[
'create_time_start'
]
!=
NULL
)
&&
(
$this
->
params
[
'create_time_end'
]
!=
NULL
))
{
$where
[
'Obargain.create_time'
]
=
[
'between time'
,
[
$this
->
params
[
'create_time_start'
]
.
' 00:00:00'
],
$this
->
params
[
'create_time_end'
]
.
' 23:59:59'
];
$where
[
'Obargain.create_time'
]
=
[
'between time'
,
[
$this
->
params
[
'create_time_start'
]
.
' 00:00:00'
,
$this
->
params
[
'create_time_end'
]
.
' 23:59:59'
]
];
}
}
if
(
$this
->
params
[
'shop_type'
]
!=
NULL
)
{
if
(
$this
->
params
[
'shop_type'
]
!=
NULL
)
{
...
@@ -87,6 +87,7 @@ class PerformanceInfo extends Basic
...
@@ -87,6 +87,7 @@ class PerformanceInfo extends Basic
$field
.=
'District.district_name,'
;
$field
.=
'District.district_name,'
;
$field
.=
'Houses.landmark,'
;
$field
.=
'Houses.landmark,'
;
$field
.=
'Oorder.house_id'
;
$field
.=
'Oorder.house_id'
;
dump
(
$where
);
$return
=
$this
->
oBargainModel
->
performancelInfo
(
$where
,
$field
,
$pageSize
,
$pageNo
);
$return
=
$this
->
oBargainModel
->
performancelInfo
(
$where
,
$field
,
$pageSize
,
$pageNo
);
$return_total
=
$this
->
oBargainModel
->
performancelInfoTotal
(
$where
,
$field
);
$return_total
=
$this
->
oBargainModel
->
performancelInfoTotal
(
$where
,
$field
);
$field
=
'sum(Obargain.scale_fee) as scale_fee_sum'
;
$field
=
'sum(Obargain.scale_fee) as scale_fee_sum'
;
...
...
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