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
3fd3f224
Commit
3fd3f224
authored
Jun 22, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
评价列表加时间轴id
parent
177e4a61
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
Evaluation.php
application/index/controller/Evaluation.php
+1
-1
Evaluate.php
application/model/Evaluate.php
+5
-0
No files found.
application/index/controller/Evaluation.php
View file @
3fd3f224
...
@@ -71,7 +71,7 @@ class Evaluation extends Basic
...
@@ -71,7 +71,7 @@ class Evaluation extends Basic
}
}
//搜索条件 end
//搜索条件 end
$fields_evaluate
=
'user_nick,user_phone,evaluate_grade,evaluate_content,a.create_time,c.name,c.phone'
;
$fields_evaluate
=
'user_nick,user_phone,evaluate_grade,evaluate_content,a.create_time,c.name,c.phone
,IF(d.report_id>0, d.report_id, e.report_id) AS report_id
'
;
$data
[
'list'
]
=
$this
->
evaluateModel
->
findEvaluationList
(
$pageNo
,
$pageSize
,
'a.id desc'
,
$fields_evaluate
,
$where
);
$data
[
'list'
]
=
$this
->
evaluateModel
->
findEvaluationList
(
$pageNo
,
$pageSize
,
'a.id desc'
,
$fields_evaluate
,
$where
);
$data
[
'total'
]
=
$this
->
evaluateModel
->
findEvaluationListCount
(
$fields_evaluate
,
$where
);
$data
[
'total'
]
=
$this
->
evaluateModel
->
findEvaluationListCount
(
$fields_evaluate
,
$where
);
...
...
application/model/Evaluate.php
View file @
3fd3f224
...
@@ -107,6 +107,11 @@ class Evaluate extends Model
...
@@ -107,6 +107,11 @@ class Evaluate extends Model
->
alias
(
'a'
)
->
alias
(
'a'
)
->
join
(
'u_users b'
,
'a.user_id = b.id'
,
'left'
)
->
join
(
'u_users b'
,
'a.user_id = b.id'
,
'left'
)
->
join
(
'a_agents c'
,
'a.agents_id = c.id'
,
'left'
)
->
join
(
'a_agents c'
,
'a.agents_id = c.id'
,
'left'
)
->
join
(
'o_march_in d'
,
'a.record_id=d.id and a.source=10'
,
'left'
)
->
join
(
'o_bargain e'
,
'a.record_id=e.id and a.source =20'
,
'left'
)
->
where
(
'is_show'
,
0
)
->
where
(
'is_show'
,
0
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order_
)
->
order
(
$order_
)
...
...
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