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
d590faa5
Commit
d590faa5
authored
Oct 12, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
bad100e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
AmercementService.php
application/index/service/AmercementService.php
+6
-2
No files found.
application/index/service/AmercementService.php
View file @
d590faa5
...
...
@@ -566,6 +566,8 @@ class AmercementService
$result
[
$key
][
'money_sum'
]
=
$result
[
$key
][
'forfeit_penalty'
]
+
$val
[
'money'
];
//罚款总金额
}
$export
=
new
ExportExcelUntil
();
$e_data_new
=
[];
foreach
(
$result
as
$key
=>
$v
)
{
...
...
@@ -582,7 +584,7 @@ class AmercementService
$e_data_new
[]
=
$e_data_old
;
}
$field_num
=
10
;
$field_num
=
9
;
$title
=
[
'罚款ID'
,
'罚款项目'
,
'提交时间'
,
'提交人'
,
'罚款金额'
,
'被罚款人'
,
'状态'
,
'滞纳金'
,
'付款金额'
,
'备注'
];
$title2
=
'罚款账单表'
;
$export
->
exportTable
(
'罚款账单表'
,
$e_data_new
,
$field_num
,
$title2
,
$title
);
...
...
@@ -637,7 +639,9 @@ class AmercementService
//被罚款人姓名
if
(
!
empty
(
$params
[
'name'
]))
{
$user_id_str
=
$this
->
getAgentIDList
(
$params
[
'name'
]);
$conditions
[
'agent_id'
]
=
[
'in'
,
$user_id_str
];
if
(
$user_id_str
){
$conditions
[
'agent_id'
]
=
[
'in'
,
$user_id_str
];
}
}
return
$conditions
;
}
...
...
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