1.28功能提交

master
zhengyongxing 4 years ago
parent deff984922
commit 58e8efbd7f

@ -2334,6 +2334,14 @@ class CompanyStatementPoolController extends ThinkController
$statement_data = $model->where(['id'=>$key])->find();
if ($statement_data['is_reward_fine_split'] == 1) {
$r_data = $model->field("fine,reward")->where(['id'=>$key])->find();
if($model == SM("company_statement_info","tab_")) {
$reward += $r_data['reward'];
$fine += $r_data['fine'];
} else {
$lreward += $r_data['reward'];
$lfine += $r_data['fine'];
}
$model->where(['id'=>$key])->save(['remark'=>$remark[$key][$st[$key][$akey]]]);
break;
}
@ -2458,6 +2466,15 @@ class CompanyStatementPoolController extends ThinkController
$statement_data = $model->where(['id'=>$key])->find();
if ($statement_data['is_reward_fine_split'] == 1) {
$r_data = $model->field("fine,reward")->where(['id'=>$key])->find();
if($model == SM("company_statement_info","tab_")) {
$reward += $r_data['reward'];
$fine += $r_data['fine'];
} else {
$lreward += $r_data['reward'];
$lfine += $r_data['fine'];
}
$model->where(['id'=>$key])->save(['remark'=>$remark[$key][$st[$key][$akey]]]);
break;
}

Loading…
Cancel
Save