1

protected/class/receipt.func.php

@@ -3,7 +3,9 @@
 /*
  * 办事处汇总明细
  */
-function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
+function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
+	
+	
 	$html='';
 	foreach ($cglist as $cgk=>$value){
 		
@@ -70,7 +72,7 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 		}
 		
 		
-		//办事处全年合计
+		//办事处全年合计---全年全办事处合计
 		$summaryYearHtml='<tr><th>'.$value['title'].'年合计</th>
 										<td class="taR"></td>
 										<td class="taR"></td>
@@ -81,9 +83,11 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 		foreach ($aiAllList as $aalk=>$aalv){
 			//栏目
 			$summaryYearHtml.='<td class="taR colRed">'.$yearPriceArray[$aalk].'</td>';
+			$topYearPrice[$aalk]+=$yearPriceArray[$aalk];
 			//栏目细则
 			foreach ($aalv as $k=>$v){
 				$summaryYearHtml.='<th>'.$yearLawsPriceArray[$aalk][$v['name']].'</th>';
+				$topYearLawsPrice[$aalk][$v['name']]+=$yearPriceArray[$aalk];
 			}
 		}
 		$summaryYearHtml.='</tr>';
@@ -92,10 +96,28 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 		$html.=$summaryDateHtml;
 	}
 	
+	//全办事处全年合计
+	$topYearTempHtml='<tr><th>'.$year.'年合计</th>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR colGreen"></td>';
+	foreach ($aiAllList as $aalk=>$aalv){
+		//栏目
+		$topYearTempHtml.='<td class="taR colRed">'.$topYearPrice[$aalk].'</td>';
+		//栏目细则
+		foreach ($aalv as $k=>$v){
+			$topYearTempHtml.='<th>'.$topYearLawsPrice[$aalk][$v['name']].'</th>';
+		}
+	}
+	$topYearTempHtml.='</tr>';
 	
+	$topHtml.=$topYearTempHtml;
+	$topHtml.=$html;
 	
-	
-	return $html;
+	return $topHtml;
 }
 
 

protected/controller/ReceiptExtendController.php

@@ -2698,7 +2698,7 @@ class ReceiptExtendController extends DooController {
     		Doo::loadClass ( 'receipt.func' );
     		//构建数据html
     		$cglist=$category->getCategoryInCid($cidIn);
-    		$summaryDateHtml=_getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary);
+    		$summaryDateHtml=_getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year);