1

protected/class/receipt.func.php

@@ -1874,7 +1874,6 @@ function excelRCData($summaryData,$aiAllList,$cglist,$year){
 			$sumRowStart=$onRow-1;
 			$obj->getActiveSheet()->getStyle($col.$onRow)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00);//设置百分比
 			$obj-> getActiveSheet() -> getStyle($col.$onRow) -> getFont()->getColor()->setRGB('f70000');
-			//$obj->getactivesheet()->setCellValue( $col.$onRow, '=SUM('.$sectionStart.$onRow.':'.$sectionCount[$aiak]['1'].$onRow.')' );
 			$obj->getactivesheet()->setCellValue( $col.$onRow, '='.$col.$sumRowStart.'/'.$col.'4' );
 			$col++;
 			foreach ($aiav as $k=>$v){//项目细则
@@ -1916,24 +1915,8 @@ function excelRCData($summaryData,$aiAllList,$cglist,$year){
 		
 	}
 	
-	//die;
-	/* foreach ($aiAllList as $key=>$value){
-		//栏目细则个数
-		$obj->getactivesheet()->setCellValue ( 'A1','费用项' );
-		$obj->getactivesheet()->setCellValue ( 'B1','收入' );
-		$obj->getactivesheet()->setCellValue ( 'B3','利润' );
-		$obj->getactivesheet()->setCellValue ( 'C3','利润占比' );
-		$obj->getactivesheet()->setCellValue ( 'D3','收入合计' );
-	} */
-	
-	
-// 	echo (int)($cellCount/26).'</br>';
-// 	echo ($cellCount%26).'</br>';
-	
-// 	echo $cellCount;die;
-// 	cellColor('A1:', 'ddebf7',$obj);
+
 	
-	//$obj->getActiveSheet()->getStyle('A1:J1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
 	
 	$objWrite = PHPExcel_IOFactory::createWriter ( $obj, 'Excel2007' );
 	header ( 'pragma:public' );

protected/controller/ReceiptExtendController.php

@@ -2662,7 +2662,7 @@ class ReceiptExtendController extends DooController {
     function receiptSummaryStatisticsByAgency(){
     	
     	$cidIn = $this->get_args ( 'cidIn' ) ? $this->get_args ( 'cidIn' ) : '12,10,9';
-    	$year=2019; //= $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date('Y');
+    	$year= $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date('Y');
     	
     	
     	$sectionHtml=$sectionItemHtml='';