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
46e60a0a
Commit
46e60a0a
authored
Jul 26, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e4c3e16c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
CostParameter.php
application/index/controller/CostParameter.php
+3
-3
No files found.
application/index/controller/CostParameter.php
View file @
46e60a0a
...
@@ -82,7 +82,7 @@ class CostParameter extends Basic
...
@@ -82,7 +82,7 @@ class CostParameter extends Basic
if
(
!
$store_data_res
){
if
(
!
$store_data_res
){
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'id'
]);
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'id'
]);
$list
[
$k
][
'transfer_charge'
]
=
$transfer_charge
;
//手续费
$list
[
$k
][
'transfer_charge'
]
=
$transfer_charge
;
//手续费
$social_security_fee
=
$this
->
getLastSocialSecurityFee
(
$v
[
'id'
]);
$social_security_fee
=
$this
->
getLastSocialSecurityFee
(
$v
[
'id'
]
,
$params
[
'setting_date'
]
);
$list
[
$k
][
'social_security_fee'
]
=
$social_security_fee
;
//当月社保报销
$list
[
$k
][
'social_security_fee'
]
=
$social_security_fee
;
//当月社保报销
$list
[
$k
][
'attendance_num'
]
=
0
;
//当月考勤
$list
[
$k
][
'attendance_num'
]
=
0
;
//当月考勤
$list
[
$k
][
'official_receipts'
]
=
0
;
//当月合计总实收
$list
[
$k
][
'official_receipts'
]
=
0
;
//当月合计总实收
...
@@ -110,9 +110,9 @@ class CostParameter extends Basic
...
@@ -110,9 +110,9 @@ class CostParameter extends Basic
* @param $store_id
* @param $store_id
* @return int|mixed
* @return int|mixed
*/
*/
public
function
getLastSocialSecurityFee
(
$store_id
){
public
function
getLastSocialSecurityFee
(
$store_id
,
$setting_date
){
$f_params
[
'store_id'
]
=
$store_id
;
$f_params
[
'store_id'
]
=
$store_id
;
$f_params
[
'setting_date'
]
=
date
(
'Y
-m-01'
,
strtotime
(
'-2 month'
));
$f_params
[
'setting_date'
]
=
date
(
'Y
m01'
,
strtotime
(
'-1 month'
,
strtotime
(
$setting_date
)
));
$store_data_res
=
$this
->
m_store_data
->
findByOne
(
'social_security_fee'
,
$f_params
);
$store_data_res
=
$this
->
m_store_data
->
findByOne
(
'social_security_fee'
,
$f_params
);
if
(
if
(
(
isset
(
$store_data_res
[
'social_security_fee'
]))
&&
(
isset
(
$store_data_res
[
'social_security_fee'
]))
&&
...
...
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