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
6d8cfe19
Commit
6d8cfe19
authored
Mar 18, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
306c1967
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
Finance.php
application/index/controller/Finance.php
+1
-1
CActivity.php
application/model/CActivity.php
+1
-3
UpdateActivityTask.php
application/task/controller/UpdateActivityTask.php
+2
-2
No files found.
application/index/controller/Finance.php
View file @
6d8cfe19
...
@@ -3059,7 +3059,7 @@ class Finance extends Basic
...
@@ -3059,7 +3059,7 @@ class Finance extends Basic
$export
=
new
ExportExcelUntil
();
$export
=
new
ExportExcelUntil
();
$title
=
[
'提交时间'
,
'收款ID'
,
'带看ID'
,
'成交报告ID'
,
'入账日期'
,
'提交人'
,
'对应业务员'
,
'所属门店'
,
'类型'
,
'收款金额(元)'
,
'实付金额'
,
'来源'
,
'状态'
];
$title
=
[
'提交时间'
,
'收款ID'
,
'带看ID'
,
'成交报告ID'
,
'入账日期'
,
'提交人'
,
'对应业务员'
,
'所属门店'
,
'类型'
,
'收款金额(元)'
,
'实付金额'
,
'来源'
,
'状态'
];
$export
->
exportTable
(
'收款记录'
,
$
excel_
data
,
14
,
'收款记录'
,
$title
);
$export
->
exportTable
(
'收款记录'
,
$data
,
14
,
'收款记录'
,
$title
);
}
}
}
catch
(
\Exception
$e
)
{
}
catch
(
\Exception
$e
)
{
$msg
=
'内部错误:'
.
$e
->
getMessage
();
$msg
=
'内部错误:'
.
$e
->
getMessage
();
...
...
application/model/CActivity.php
View file @
6d8cfe19
...
@@ -112,9 +112,7 @@ class CActivity extends Model
...
@@ -112,9 +112,7 @@ class CActivity extends Model
*/
*/
public
function
updateStatus
(
$activity_id
,
$status
)
public
function
updateStatus
(
$activity_id
,
$status
)
{
{
$result
=
$this
->
db_
$result
=
$this
->
db_
->
where
([
'id'
=>
$activity_id
])
->
update
([
'status'
=>
$status
]);
->
where
([
'id'
=>
$activity_id
])
->
update
([
'status'
=>
$status
]);
// big_log($this->getLastSql());
// big_log($this->getLastSql());
return
$result
;
return
$result
;
}
}
...
...
application/task/controller/UpdateActivityTask.php
View file @
6d8cfe19
...
@@ -82,13 +82,13 @@ class UpdateActivityTask
...
@@ -82,13 +82,13 @@ class UpdateActivityTask
#开始时间大于当时前时间
#开始时间大于当时前时间
if
(
$v
[
'activity_start_time'
]
>
date
(
"Y-m-d H:i:s"
,
time
())){
if
(
$v
[
'activity_start_time'
]
>
date
(
"Y-m-d H:i:s"
,
time
())){
$this
->
m_active
->
updateStatus
(
$v
[
'id'
],
5
);
$this
->
m_active
->
editorActivity
(
$v
[
'id'
],[
'status'
=>
5
]
);
continue
;
continue
;
}
}
#结束时间小于当时前时间
#结束时间小于当时前时间
if
(
$v
[
'activity_end_time'
]
<
date
(
"Y-m-d H:i:s"
,
time
())){
if
(
$v
[
'activity_end_time'
]
<
date
(
"Y-m-d H:i:s"
,
time
())){
$this
->
m_active
->
updateStatus
(
$v
[
'id'
],
3
);
$this
->
m_active
->
editorActivity
(
$v
[
'id'
],[
'status'
=>
3
]
);
continue
;
continue
;
}
}
}
}
...
...
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