Commit 46e60a0a authored by zhuwei's avatar zhuwei

1

parent e4c3e16c
...@@ -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('Ym01',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'])) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment