瀏覽代碼

fixed stats business

a.binder 8 年之前
父節點
當前提交
75f3048632
共有 1 個文件被更改,包括 11 次插入9 次删除
  1. 11 9
      SE/superedit-STATYSTYKA_TABELE.php

+ 11 - 9
SE/superedit-STATYSTYKA_TABELE.php

@@ -578,12 +578,7 @@ function STATYSTYKA_TABELE() {
 				, count(BUILDINGS.ID)/MK_Rewiry.gis_square_ha_area as REWIR_BUILDINGS_DENSITY -- to jest bledne - poprawka potem - nie da sie tu policzyc
 				, count(USERS2_MARKETING.S_ADDRESS_STREET)/MK_Rewiry.gis_square_ha_area as REWIR_HOMES_DENSITY
 				, BUILDINGS.A_CLASSIFIED
-				, sum(budget_costs.COST_TOTAL) as budget_costs_COST
-				, sum(budget_plans.COST) as budget_plans_COST
-				, sum(budget_plans.COST) - sum(budget_costs.COST_TOTAL) as budget_COST_rest
-				, GREATEST(sum(budget_plans.COST), sum(budget_costs.COST_TOTAL))/count(USERS2_MARKETING.S_ADDRESS_STREET) as budget_plans_div_HP
-
-			";
+							";
 			foreach ($COLSFORSTATS as $FFS) {
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
 					$sql .= ", round(( sum(
@@ -623,9 +618,6 @@ function STATYSTYKA_TABELE() {
 				from USERS2_MARKETING as USERS2_MARKETING
 					left join BUILDINGS on BUILDINGS.S_ADDRESS_STREET=USERS2_MARKETING.T_TELBOX_BUILDING_IN
 					left join MK_Rewiry on MK_Rewiry.NAZWA_REWI=BUILDINGS.M_REWIR
-					left join test_budget_project_synthetics_view as budget_costs on budget_costs.ID_PROJECT=MK_Rewiry.ID_PROJECT 
-					left join test_budget_project_synthetics_plans_view as budget_plans on budget_plans.ID_PROJECT=MK_Rewiry.ID_PROJECT 
-
 					
 				where USERS2_MARKETING.A_STATUS!='DELETED' and BUILDINGS.A_STATUS!='DELETED'
 				group by USERS2_MARKETING.M_REWIR
@@ -658,8 +650,18 @@ function STATYSTYKA_TABELE() {
 			$sqlList[]="UPDATE USERS2_OFFERS_GROUPS set A_CLASSIFIED='22913_PODMIOT_NETDAY_zoo_podmiot' , A_ADM_COMPANY='22913_PODMIOT_NETDAY_zoo_podmiot' where P_SERVICE_COMPANY='NETDAY' ";
 			$sqlList[]="UPDATE USERS2_OFFERS t1, USERS2_OFFERS_GROUPS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED , t1.P_SERVICE_COMPANY=t2.P_SERVICE_COMPANY where t2.ID_NET=t1.ID or t2.ID_TEL=t1.ID or t2.ID_TV=t1.ID";
 			$sqlList[]="UPDATE USERS2_OFFERS_COSTS_GROUPS t1, USERS2_OFFERS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED  where t2.ID_COSTS_GROUPS=t1.ID";
+			
+			//, sum(budget_costs.COST_TOTAL) as budget_costs_COST
+			//	, sum(budget_plans.COST) as budget_plans_COST
+			//	, sum(budget_plans.COST) - sum(budget_costs.COST_TOTAL) as budget_COST_rest
+			//	, GREATEST(sum(budget_plans.COST), sum(budget_costs.COST_TOTAL))/count(USERS2_MARKETING.S_ADDRESS_STREET) as budget_plans_div_HP
 
 
+			//left join test_budget_project_synthetics_view as budget_costs on budget_costs.ID_PROJECT=MK_Rewiry.ID_PROJECT 
+			//left join test_budget_project_synthetics_plans_view as budget_plans on budget_plans.ID_PROJECT=MK_Rewiry.ID_PROJECT 
+
+					
+
 		}
 
 		{// add fields to USERS2_MARKETING_OVERWIEV