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
df04f477
Commit
df04f477
authored
Nov 29, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PC-进场记录列表
parent
22207889
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
MarchIn.php
application/index/controller/MarchIn.php
+6
-1
No files found.
application/index/controller/MarchIn.php
View file @
df04f477
...
...
@@ -7,6 +7,7 @@ namespace app\index\controller;
* Date: 2018/6/13
* Time: 上午10:18
*/
use
app\api_broker\service\OrderLogService
;
use
app\index\extend\Basic
;
use
app\model\OMarchInModel
;
use
think\Request
;
...
...
@@ -89,11 +90,15 @@ class MarchIn extends Basic
}
//搜索条件 end
$fields_evaluate
=
'a.report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,'
;
$fields_evaluate
=
'a.
id,a.
report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,'
;
$fields_evaluate
.=
'd.report_agent_phone,e.store_name,a.march_in_img,f.longitude,f.latitude,a.march_in_area'
;
$data
[
'list'
]
=
$this
->
oMarchInModel
->
findmarchInList
(
$pageNo
,
$pageSize
,
'a.id desc'
,
$fields_evaluate
,
$where
);
$data
[
'total'
]
=
$this
->
oMarchInModel
->
findmarchInListCount
(
$fields_evaluate
,
$where
);
$OrderLogService
=
new
OrderLogService
();
foreach
(
$data
[
'list'
]
as
$k
=>
$v
){
$data
[
'list'
][
$k
][
'march_in_img'
]
=
$OrderLogService
->
getOImg
(
$v
[
'id'
],
1
);
}
//var_dump($result);
//return $result;
...
...
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