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
7c615e4f
Commit
7c615e4f
authored
Jul 20, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'chat_0705' of
https://gitee.com/zwyjjc/tl_estate
into chat_0705
parents
acadba45
62678912
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
StatementService.php
application/api_broker/service/StatementService.php
+1
-0
OReportModel.php
application/model/OReportModel.php
+0
-1
No files found.
application/api_broker/service/StatementService.php
View file @
7c615e4f
...
...
@@ -221,6 +221,7 @@ class StatementService
$obargain
=
new
OBargainModel
();
$performanceSum
=
$obargain
->
getAddBargainNum
(
$where_
,
1
);
//1表示业绩 2表示实收
$result
[
"director_performance_month"
]
=
isset
(
$performanceSum
[
0
][
"num"
])
?
$performanceSum
[
0
][
"num"
]
:
0
;
//todo 上周业绩
$where_
=
[];
$start_time
=
date
(
"Y-m-d"
,
strtotime
(
"-14 day"
));
...
...
application/model/OReportModel.php
View file @
7c615e4f
...
...
@@ -512,7 +512,6 @@ class OReportModel extends Model
AND `a`.`status` = 0
AND `b`.`is_del` = 0
) ) as aaa
$where_params
"
;
var_dump
(
$sql
);
$result
=
$this
->
db
->
query
(
$sql
);
//echo $this->getLastSql();
...
...
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