1

protected/controller/ReceiptExtendController.php

@@ -2757,7 +2757,7 @@ class ReceiptExtendController extends DooController {
     	$data ['memu'] = "receipt";
     	$data ['staff'] = $this->staff;
     	
-    	$data ['receiptMemu'] = 'receiptTrainRevenue';
+    	$data ['receiptMemu'] = 'companyCategoryCollect';
     	$data ['verifyId'] = $this->verifyId;
     	$data ['executeId'] = $this->executeId;
     	
@@ -2778,7 +2778,17 @@ class ReceiptExtendController extends DooController {
     function exportReceiptSummaryExcel(){
     	$summaryData= $this->get_args ( 'summaryData' ) ? $this->get_args ( 'summaryData' ) : "";
     	$year= $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : "";
-    	$cidIn = $this->get_args ( 'cidIn' ) ? $this->get_args ( 'cidIn' ) : '12,10,9';
+    	//$cidIn = $this->get_args ( 'cidIn' ) ? $this->get_args ( 'cidIn' ) : '12,10,9';
+    	
+    	Doo::loadClass ( 'XDeode' );
+    	
+    	$cidKeyIn=file_get_contents( "protected/config/receipt/summary.conf.ini");
+    	$cidKeyIn=explode(',', $cidKeyIn);$cidIn=array();
+    	foreach ($cidKeyIn as $key=>$value){
+    		$XDeode = new XDeode ( 5 );
+    		array_push($cidIn, $XDeode->decode($value));
+    	}
+    	$cidIn=implode(',', $cidIn);
     	
     	if(!empty($summaryData)){