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
6be217e5
Commit
6be217e5
authored
Aug 08, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
5dadeac4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
PerformanceService.php
application/api_broker/service/PerformanceService.php
+4
-3
OBargainModel.php
application/model/OBargainModel.php
+7
-4
No files found.
application/api_broker/service/PerformanceService.php
View file @
6be217e5
...
...
@@ -179,6 +179,7 @@ class PerformanceService
}
$condition
[
'create_time'
]
=
array
(
'between'
,
array
(
$start_time
.
" 00:00:00"
,
$end_time
.
" 23:59:59"
)
);
$condition
[
"is_case"
]
=
$is_case
;
$result
=
$this
->
nowTimeSum
(
$condition
,
2
);
if
(
count
(
$result
)
>
0
&&
$house_id
==
0
)
{
$result
[
"house_arr"
]
=
$house_id_arr
;
...
...
@@ -231,7 +232,7 @@ class PerformanceService
break
;
}
$result
=
$this
->
getOrderList
(
$params
,
$type
);
$result
=
$this
->
getOrderList
(
$params
,
$type
,
$is_case
);
if
(
count
(
$result
)
>
0
)
{
return
$result
;
}
else
{
...
...
@@ -240,7 +241,7 @@ class PerformanceService
}
public
function
getOrderList
(
$params
,
$type
)
public
function
getOrderList
(
$params
,
$type
,
$is_case
)
{
$result
=
[];
//1带看 2进场 3收款 4成交报告
...
...
@@ -260,7 +261,7 @@ class PerformanceService
break
;
case
4
:
$field
=
"DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id,d.internal_title,d.internal_address"
;
$result
=
$this
->
bargainModel
->
getAddBargainOrderList
(
$field
,
$params
);
$result
=
$this
->
bargainModel
->
getAddBargainOrderList
(
$field
,
$params
,
$is_case
);
break
;
default
:
...
...
application/model/OBargainModel.php
View file @
6be217e5
...
...
@@ -679,8 +679,9 @@ class OBargainModel extends Model
}
elseif
(
$type
==
3
)
{
$field
=
"count(1) as num"
;
$where_
[
"a.trade_type"
]
=
10
;
//$where_["a.father_id"] = 0;
if
(
isset
(
$params
[
"is_case"
])
&&
$params
[
"is_case"
]
==
2
)
{
$where_
[
"a.father_id"
]
=
0
;
}
array_push
(
$join
,
[
' o_report c'
,
'a.report_id=c.id'
,
'left'
]);
}
...
...
@@ -787,7 +788,7 @@ class OBargainModel extends Model
->
select
();
}
public
function
getAddBargainOrderList
(
$field
,
$params
)
public
function
getAddBargainOrderList
(
$field
,
$params
,
$is_case
)
{
$where_
=
[];
...
...
@@ -797,7 +798,9 @@ class OBargainModel extends Model
}
if
(
isset
(
$params
[
"create_time"
]))
{
$where_
[
"a.create_time"
]
=
$params
[
"create_time"
];
//$where_["a.father_id"] = 0;
if
(
$is_case
==
2
)
{
$where_
[
"a.father_id"
]
=
0
;
}
$where_
[
"a.trade_type"
]
=
10
;
}
...
...
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