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
5e5b3bfc
Commit
5e5b3bfc
authored
Jun 26, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
c6370c14
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
AppointmentTime.php
application/api/controller/AppointmentTime.php
+1
-1
OReportModel.php
application/model/OReportModel.php
+6
-2
No files found.
application/api/controller/AppointmentTime.php
View file @
5e5b3bfc
...
@@ -212,7 +212,7 @@ class AppointmentTime extends Basic
...
@@ -212,7 +212,7 @@ class AppointmentTime extends Basic
public
function
getYetListV2
(
$pageNo
,
$pageSize
,
$params
)
public
function
getYetListV2
(
$pageNo
,
$pageSize
,
$params
)
{
{
$field
=
"a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
$field
=
"a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
d.external_title as house_title,d.residue_num as room_num_left"
;
d.external_title as house_title,d.residue_num as room_num_left
, d.is_show,d.status
"
;
$where_
[
"a.user_id"
]
=
$params
[
"user_id"
];
$where_
[
"a.user_id"
]
=
$params
[
"user_id"
];
// $result = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
// $result = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
$result
=
$this
->
reportModel
->
getHaveToSeeList
(
$pageNo
,
$pageSize
,
"id desc"
,
$field
,
$where_
);
$result
=
$this
->
reportModel
->
getHaveToSeeList
(
$pageNo
,
$pageSize
,
"id desc"
,
$field
,
$where_
);
...
...
application/model/OReportModel.php
View file @
5e5b3bfc
...
@@ -539,7 +539,9 @@ class OReportModel extends Model
...
@@ -539,7 +539,9 @@ class OReportModel extends Model
a.predict_see_time AS expect_time,
a.predict_see_time AS expect_time,
`b`.`house_id`,
`b`.`house_id`,
d.external_title AS house_title,
d.external_title AS house_title,
d.residue_num AS room_num_left
d.residue_num AS room_num_left,
d.is_show,
d.status
FROM
FROM
`o_report` `a`
`o_report` `a`
LEFT JOIN `o_order` `b` ON `b`.`f_id` = `a`.`id`
LEFT JOIN `o_order` `b` ON `b`.`f_id` = `a`.`id`
...
@@ -558,7 +560,9 @@ class OReportModel extends Model
...
@@ -558,7 +560,9 @@ class OReportModel extends Model
a.house_id,
a.house_id,
a.user_id,
a.user_id,
b.external_title AS house_title,
b.external_title AS house_title,
b.residue_num AS room_num_left
b.residue_num AS room_num_left,
b.is_show,
b.status
FROM
FROM
u_appoint_watch_shop a
u_appoint_watch_shop a
LEFT JOIN g_houses b ON a.house_id = b.id
LEFT JOIN g_houses b ON a.house_id = b.id
...
...
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