|
|
@@ -570,7 +570,7 @@ function STATYSTYKA_TABELE() {
|
|
|
, sum( if( USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 70 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY < 100, 1 ,0 ) ) as PAY_70_100
|
|
|
, sum( if( USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 100 , 1 ,0 ) ) as PAY_100_more
|
|
|
, BUILDINGS.A_ADM_COMPANY
|
|
|
- , MK_Rewiry.the_geom , MK_Rewiry.A_STATUS , MK_Rewiry.ID_PROJECT , MK_Rewiry.ID_KORESP_PROJEKT , MK_Rewiry.ID_KORESP_PROJ_WYK , MK_Rewiry.ID_KORESP_ZLECENIE , MK_Rewiry.ID_KORESP_PROTOK_ODB , MK_Rewiry.ID_KORESP_OFFER , MK_Rewiry.ID_KORESP_UMOWA_DEVELOPPER , MK_Rewiry.ID_KORESP_ZLECENIE_PROJEKT
|
|
|
+ , MK_Rewiry.the_geom , MK_Rewiry.A_STATUS , MK_Rewiry.ID_PROJECT , MK_Rewiry.ID_KORESP_PROJEKT , MK_Rewiry.ID_KORESP_PROJ_WYK , MK_Rewiry.ID_KORESP_ZLECENIE , MK_Rewiry.ID_KORESP_PROTOK_ODB , MK_Rewiry.ID_KORESP_OFFER , MK_Rewiry.ID_KORESP_UMOWA_DEVELOPPER , MK_Rewiry.ID_KORESP_ZLECENIE_PROJEKT
|
|
|
, count(BUILDINGS.ID) as BUDYNKOW -- To jest bledne - poprawka potem - nie da sie tu policzyc
|
|
|
, sum(if(BUILDINGS.A_STATUS='NORMAL',1,0)) as BUDYNKOW_NORMAL -- to jest bledne - poprawka potem - nie da sie tu policzyc
|
|
|
, sum(if(BUILDINGS.A_STATUS='WAITING',1,0)) as BUDYNKOW_WAITING -- to jest bledne - poprawka potem - nie da sie tu policzyc
|
|
|
@@ -651,12 +651,21 @@ function STATYSTYKA_TABELE() {
|
|
|
$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";
|
|
|
|
|
|
+ $sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_costs_COST` DOUBLE(11,2) ";
|
|
|
+ $sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_plans_COST` DOUBLE(11,2) ";
|
|
|
+ $sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_COST_rest` DOUBLE(11,2) ";
|
|
|
+ $sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_plans_div_HP` DOUBLE(11,2) ";
|
|
|
+ $sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_costs_COST=( select sum(t2.COST_TOTAL) from test_budget_project_synthetics_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)";
|
|
|
+ $sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_plans_COST=( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)";
|
|
|
+ $sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_COST_rest=( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)- ( select sum(t3.COST_TOTAL) from test_budget_project_synthetics_view t3 where t1.ID_PROJECT=t3.ID_PROJECT)";
|
|
|
+ $sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_plans_div_HP=GREATEST(( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT),( select sum(t3.COST_TOTAL) from test_budget_project_synthetics_view t3 where t1.ID_PROJECT=t3.ID_PROJECT))/t1.MIESZKAN";
|
|
|
+
|
|
|
+
|
|
|
//, 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
|
|
|
|