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
0ab47d33
Commit
0ab47d33
authored
Jun 26, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
office
parent
878fafda
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
2 deletions
+20
-2
OfficeBargain.php
application/index/controller/OfficeBargain.php
+1
-1
AAgents.php
application/model/AAgents.php
+18
-0
ResultsSummaryOfficeTask.php
application/task/controller/ResultsSummaryOfficeTask.php
+1
-1
No files found.
application/index/controller/OfficeBargain.php
View file @
0ab47d33
...
...
@@ -830,7 +830,7 @@ class OfficeBargain extends Basic
if
(
!
empty
(
$where
))
{
//获取被修改人信息
$m_agent
=
new
AAgents
();
$agent_data
=
$m_agent
->
agentBargainAll
(
'a.id,a.store_id,a.district_id,b.create_time'
,
$where
);
$agent_data
=
$m_agent
->
agentBargain
Office
All
(
'a.id,a.store_id,a.district_id,b.create_time'
,
$where
);
foreach
(
$agent_data
as
$k
=>
$v
)
{
$create_time
=
date
(
'Y-m-d'
,
strtotime
(
$v
[
'create_time'
]));
$this
->
totalOfficialReceipts
(
$v
[
'id'
],
$v
[
'district_id'
],
$v
[
'store_id'
],
$create_time
);
...
...
application/model/AAgents.php
View file @
0ab47d33
...
...
@@ -1354,6 +1354,24 @@ class AAgents extends BaseModel
return
$data
;
}
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|\think\Model
*/
public
function
agentBargainOfficeAll
(
$field
,
$where
)
{
try
{
$data
=
$this
->
alias
(
'a'
)
->
field
(
$field
)
->
join
(
'office_o_bargain b'
,
'a.id = b.agent_id'
,
'left'
)
->
where
(
$where
)
->
select
();
}
catch
(
\Exception
$e
)
{
$data
=
[];
}
return
$data
;
}
/**
* 获取绑定号码
*
...
...
application/task/controller/ResultsSummaryOfficeTask.php
View file @
0ab47d33
...
...
@@ -365,7 +365,7 @@ class ResultsSummaryOfficeTask
}
if
(
!
empty
(
$where
))
{
//获取被修改人信息
$agent_data
=
$this
->
agentsModel
->
agentBargainAll
(
'a.id,a.store_id,a.district_id,b.create_time'
,
$where
);
$agent_data
=
$this
->
agentsModel
->
agentBargain
Office
All
(
'a.id,a.store_id,a.district_id,b.create_time'
,
$where
);
foreach
(
$agent_data
as
$k
=>
$v
)
{
$create_time
=
date
(
'Y-m-d'
,
strtotime
(
$v
[
'create_time'
]));
$this
->
totalOfficialReceipts
(
$v
[
'id'
],
$v
[
'district_id'
],
$v
[
'store_id'
],
$create_time
);
...
...
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