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
b15a31d7
Commit
b15a31d7
authored
Jul 24, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
list
parent
92889749
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
Cost.php
application/index/controller/Cost.php
+2
-5
CostParameter.php
application/index/controller/CostParameter.php
+2
-5
No files found.
application/index/controller/Cost.php
View file @
b15a31d7
...
...
@@ -300,13 +300,10 @@ class Cost extends Basic
$m_setting
=
new
FSettingLog
();
$setting_data
=
$m_setting
->
findByAll
(
'type,operator_name'
,
[
'setting_date'
=>
$data
[
'count_time'
]]);
$type_name
=
[
'考勤核对人'
,
'社保核对人'
,
'手续费核对人'
,
'办公室房租+当月办公门店核对人'
,
'费用参数核对人'
];
foreach
(
$setting_data
as
$k
=>
$v
)
{
$list
[
$v
[
'type'
]][
]
=
[
$list
[]
=
[
'operator_name'
=>
$v
[
'operator_name'
],
'type'
=>
$v
[
'type'
],
'type_name'
=>
$type_name
[
$v
[
'type'
]]
];
'type'
=>
$v
[
'type'
]
];
}
if
(
isset
(
$list
))
{
$data
[
'setting_log'
]
=
$list
;
...
...
application/index/controller/CostParameter.php
View file @
b15a31d7
...
...
@@ -497,13 +497,10 @@ class CostParameter extends Basic
$where
[
'is_del'
]
=
0
;
$setting_data
=
$m_log
->
findByAll
(
'type,operator_name'
,
$where
);
$type_name
=
[
'考勤核对人'
,
'社保核对人'
,
'手续费核对人'
,
'办公室房租+当月办公门店核对人'
,
'费用参数核对人'
];
foreach
(
$setting_data
as
$k
=>
$v
)
{
$list
[
$v
[
'type'
]][
]
=
[
$list
[]
=
[
'operator_name'
=>
$v
[
'operator_name'
],
'type'
=>
$v
[
'type'
],
'type_name'
=>
$type_name
[
$v
[
'type'
]]
];
'type'
=>
$v
[
'type'
]
];
}
return
$this
->
response
(
200
,
''
,
$list
);
}
...
...
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