|
@@ -6,16 +6,16 @@
|
|
|
function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
|
|
|
|
|
|
|
|
|
- $html='';
|
|
|
+ $html=array();
|
|
|
foreach ($cglist as $cgk=>$value){
|
|
|
|
|
|
|
|
|
//初始化年合计数组
|
|
|
foreach ($aiAllList as $yptempk=>$yptempv){
|
|
|
- $yearPriceArray[$yptempk]=0;
|
|
|
+ $yearPriceArray[$value['cid']][$yptempk]=0;
|
|
|
//栏目细则
|
|
|
foreach ($yptempv as $k=>$v){
|
|
|
- $yearLawsPriceArray[$yptempk][$v['name']]=0;
|
|
|
+ $yearLawsPriceArray[$value['cid']][$yptempk][$v['name']]=0;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -43,7 +43,7 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
|
|
|
if($dsv['item']==$v['name']){
|
|
|
$tempHtml.='<td class="taR">'.$dsv['price'].'</td>';
|
|
|
$tempPrice+=$dsv['price'];
|
|
|
- $yearLawsPriceArray[$aiak][$v['name']]+=$dsv['price'];//该办事处项目细则金额合计
|
|
|
+ $yearLawsPriceArray[$value['cid']][$aiak][$v['name']]+=$dsv['price'];//该办事处项目细则金额合计
|
|
|
$falg=false;
|
|
|
break;
|
|
|
}
|
|
@@ -53,7 +53,7 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $yearPriceArray[$aiak]+=$tempPrice;
|
|
|
+ $yearPriceArray[$value['cid']][$aiak]+=$tempPrice;
|
|
|
|
|
|
$itemHtml.='<td class="taR colRed">'.$tempPrice.'</td>';//每个月份 项目金额合计
|
|
|
$itemHtml.=$tempHtml;//每个月份项目细则金额
|
|
@@ -85,31 +85,30 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
|
|
|
$topYearPrice[$aalk]=0;
|
|
|
}
|
|
|
//栏目
|
|
|
- $summaryYearHtml.='<td class="taR colRed">'.$yearPriceArray[$aalk].'</td>';
|
|
|
- $topYearPrice[$aalk]+=$yearPriceArray[$aalk];
|
|
|
+ $summaryYearHtml.='<td class="taR colRed">'.$yearPriceArray[$value['cid']][$aalk].'</td>';
|
|
|
+ $topYearPrice[$aalk]+=$yearPriceArray[$value['cid']][$aalk];
|
|
|
//栏目细则
|
|
|
foreach ($aalv as $k=>$v){
|
|
|
if(!isset($topYearLawsPrice[$aalk][$v['name']])){
|
|
|
$topYearLawsPrice[$aalk][$v['name']]=0;
|
|
|
}
|
|
|
|
|
|
- $summaryYearHtml.='<th>'.$yearLawsPriceArray[$aalk][$v['name']].'</th>';
|
|
|
- $topYearLawsPrice[$aalk][$v['name']]+=$yearLawsPriceArray[$aalk][$v['name']];
|
|
|
+ $summaryYearHtml.='<th>'.$yearLawsPriceArray[$value['cid']][$aalk][$v['name']].'</th>';
|
|
|
+ $topYearLawsPrice[$aalk][$v['name']]+=$yearLawsPriceArray[$value['cid']][$aalk][$v['name']];
|
|
|
}
|
|
|
}
|
|
|
$summaryYearHtml.='</tr>';
|
|
|
|
|
|
- $html.=$summaryYearHtml;
|
|
|
- $html.=$summaryDateHtml;
|
|
|
+ $html[$value['cid']]['total']=$summaryYearHtml;
|
|
|
+ $html[$value['cid']]['allMonth']=$summaryDateHtml;
|
|
|
+
|
|
|
+ //$html.=$summaryYearHtml;//办事处合计
|
|
|
+ //$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"></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){
|
|
|
//栏目
|
|
@@ -119,10 +118,15 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
|
|
|
$topYearTempHtml.='<th>'.$topYearLawsPrice[$aalk][$v['name']].'</th>';
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //各办事处占比
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
$topYearTempHtml.='</tr>';
|
|
|
$topHtml='';
|
|
|
- $topHtml.=$topYearTempHtml;
|
|
|
- $topHtml.=$html;
|
|
|
+ $topHtml.=$topYearTempHtml;//全年合计
|
|
|
+
|
|
|
|
|
|
return $topHtml;
|
|
|
}
|