|
@@ -2234,10 +2234,17 @@ class ReceiptController extends DooController {
|
|
|
// 收入合计
|
|
|
Doo::loadModel ( 'invoiceTraining' );
|
|
|
$invoiceTraining = new invoiceTraining ();
|
|
|
+ $invoiceTrainingDetail=array('invoiceArriveAmount'=>0,'RIAmount'=>0,'invoiceTotalAmount'=>0);
|
|
|
+ if ($receiptDetail ['invoiceTrainId']!=0){
|
|
|
$invoiceTrainingDetail = $invoiceTraining->getInvoiceTrainingByItid ( $receiptDetail ['invoiceTrainId'] );
|
|
|
+ }
|
|
|
// print_r($invoiceTrainingDetail);
|
|
|
+ $invoiceArriveAmount=$RIAmount=0;
|
|
|
+ if(!empty($invoiceTrainingDetail)){
|
|
|
+ $invoiceArriveAmount=$invoiceTrainingDetail ['invoiceArriveAmount'];
|
|
|
+ $RIAmount=$invoiceTrainingDetail ['RIAmount'];
|
|
|
+ }
|
|
|
$data ['invoiceTrainingDetail'] = $invoiceTrainingDetail;
|
|
|
-
|
|
|
// 支出项目
|
|
|
Doo::loadModel ( 'accountItem' );
|
|
|
$accountItem = new accountItem ();
|
|
@@ -2251,33 +2258,43 @@ class ReceiptController extends DooController {
|
|
|
$RItemList = $RItem->getRItemByRid ( $rid );
|
|
|
$RILecturerList = $RILecturer->getRILecturerByRid ( $rid );
|
|
|
// 支出项金额详情
|
|
|
- $aiData = $accountItem->getTrainingDetail ( $RItemList, $RILecturerList, $invoiceTrainingDetail ['invoiceArriveAmount'] );
|
|
|
+ $aiData = $accountItem->getTrainingDetail ( $RItemList, $RILecturerList, $invoiceArriveAmount );
|
|
|
//print_r($aiData);
|
|
|
|
|
|
// 利润
|
|
|
- $data ['profit'] = $invoiceTrainingDetail ['invoiceArriveAmount'] - $aiData ['total'];
|
|
|
+ $data ['profit'] = $invoiceArriveAmount - $aiData ['total'];
|
|
|
$data ['companyProfit'] = $data ['profit'] * 0.6;
|
|
|
$data ['categoryProfit'] = $data ['profit'] * 0.4;
|
|
|
// print_r($aiData['dataList']);
|
|
|
$data ['categoryActualExpenditure'] = $aiData ['total'] - $aiData ['categoryActualExpenditure'];
|
|
|
// 备用金
|
|
|
+ $sum=0;$data ['receiptLoanDetail']=array('sum'=>0);
|
|
|
+ if (!empty($receiptDetail ['trainLoanRid'])){
|
|
|
$data ['receiptLoanDetail'] = $receipt->getReceiptByRid ( $receiptDetail ['trainLoanRid'] );
|
|
|
- $data ['payment'] = $data ['receiptLoanDetail'] ['sum'] + $invoiceTrainingDetail ['RIAmount'] - $data ['categoryActualExpenditure'];
|
|
|
+ $sum=$data ['receiptLoanDetail'] ['sum'];
|
|
|
+ }
|
|
|
+ $data ['payment'] = $sum + $RIAmount - $data ['categoryActualExpenditure'];
|
|
|
|
|
|
$data ['total'] = $aiData ['total'];
|
|
|
$data ['aiCount'] = count ( $aiData ['dataList'] ) + 5;
|
|
|
$data ['aiList'] = $aiData ['dataList'];
|
|
|
|
|
|
// 占比计算
|
|
|
- $data ['totalProportion'] = number_format ( $aiData ['total'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['profitProportion'] = number_format ( $data ['profit'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['sumProportion'] = number_format ( $data ['receiptLoanDetail'] ['sum'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['invoiceTotalAmountProportion'] = number_format ( $data ['invoiceTrainingDetail'] ['invoiceTotalAmount'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['RIAmountProportion'] = number_format ( $data ['invoiceTrainingDetail'] ['RIAmount'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['companyProfitProportion'] = number_format ( $data ['companyProfit'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['categoryProportion'] = number_format ( $data ['categoryProfit'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['categoryActualExpenditureProportion'] = number_format ( $data ['categoryActualExpenditure'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
- $data ['paymentProportion'] = number_format ( $data ['payment'] / $invoiceTrainingDetail ['invoiceArriveAmount'], 2, '.', '' ) * 100;
|
|
|
+ if($invoiceArriveAmount!=0){
|
|
|
+ $data ['totalProportion'] = number_format ( $aiData ['total'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['profitProportion'] = number_format ( $data ['profit'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['sumProportion'] = number_format ( $sum / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['invoiceTotalAmountProportion'] = number_format ( $data ['invoiceTrainingDetail'] ['invoiceTotalAmount'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['RIAmountProportion'] = number_format ( $data ['invoiceTrainingDetail'] ['RIAmount'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['companyProfitProportion'] = number_format ( $data ['companyProfit'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['categoryProportion'] = number_format ( $data ['categoryProfit'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['categoryActualExpenditureProportion'] = number_format ( $data ['categoryActualExpenditure'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ $data ['paymentProportion'] = number_format ( $data ['payment'] / $invoiceArriveAmount, 2, '.', '' ) * 100;
|
|
|
+ }else{
|
|
|
+ $data ['totalProportion'] =$data ['profitProportion'] = $data ['sumProportion'] = $data ['invoiceTotalAmountProportion'] = $data ['RIAmountProportion']
|
|
|
+ = $data ['companyProfitProportion'] = $data ['categoryActualExpenditureProportion'] = $data ['paymentProportion']=$data ['categoryProportion'] = 0;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
// 审批组
|
|
|
Doo::loadModel ( 'verify' );
|
|
@@ -3940,11 +3957,18 @@ class ReceiptController extends DooController {
|
|
|
// echo 'status!=5 ' . $dateCondition . $cateCondition . $staffCondition . $approvalCondition . ' and verify in (' . $vid . ')';
|
|
|
// print_r($receiptList);
|
|
|
|
|
|
+ Doo::loadClass ( 'XDeode' );
|
|
|
+ $XDeode = new XDeode ( 7 );
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
$Locate = 0;
|
|
|
|
|
|
$reportList = $reportCateList = array ();
|
|
|
foreach ( $receiptList as $key => $value ) {
|
|
|
|
|
|
+ $receiptList [$key] ['ridKey'] = $XDeode->encode( $value['rid'] );
|
|
|
+
|
|
|
$receiptList [$key] ['Locate'] = $Locate;
|
|
|
$Locate ++;
|
|
|
$receiptList [$key] ['reviseDetail'] = array ();
|