Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug (住宅住宅作价)：修复查询小区状态位问题

Browse Source 
1. 忽略ITEM_RUNNINGSTATE=1
2. 不计算ITEM_ISBUILDINDEX=2
This commit is contained in:
purple 2020-07-01 20:58:48 +08:00
parent afeb1cffc9
commit d2a91d9b31
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ruoyi/src/main/resources/sql-template/compute_sale_price.sql
View File

@ -1,5 +1,5 @@
truncate table DW_HOUSINGCASE_COMM_#yearMonth# truncate table dbo.DW_HOUSINGCASE_COMM_#yearMonth#;
truncate table DWA_PROJECTBASEPRICE_IMDT_#yearMonth# truncate table dbo.DWA_PROJECTBASEPRICE_IMDT_#yearMonth#;
insert into DW_HOUSINGCASE_COMM_#yearMonth# insert into DW_HOUSINGCASE_COMM_#yearMonth#
select select
@ -9,7 +9,7 @@ select
, c.ITEM_AIRAID , c.ITEM_AIRAID
, c.ITEM_RANAME , c.ITEM_RANAME
, c.ITEM_RAADRESS , c.ITEM_RAADRESS
, f.ITEM_DICTEXT , f.CountyName
, g.ITEM_DICTEXT , g.ITEM_DICTEXT
, h.ITEM_DICTEXT , h.ITEM_DICTEXT
, a.Roomtype , a.Roomtype
@ -50,10 +50,9 @@ from ODS_HOUSINGCASELISTED_LJ_#yearMonth# a
left join obpm_LianCheng_Data.dbo.DIM_PROJECTID_LJ2AI b left join obpm_LianCheng_Data.dbo.DIM_PROJECTID_LJ2AI b
on a.ProjectID_LJ = b.ProjectID_LJ on a.ProjectID_LJ = b.ProjectID_LJ
left join obpm_LianCheng_Data.dbo.TLK_小区信息管理 c left join obpm_LianCheng_Data.dbo.TLK_小区信息管理 c
on b.ProjectID = c.ITEM_AIRAID and c.ITEM_ISBUILDINDEX='1' and c.ITEM_RUNNINGSTATE=1 on b.ProjectID = c.ITEM_AIRAID and c.ITEM_ISBUILDINDEX='1'
and c.ITEM_PROJECTTYPE='1' and c.ITEM_PROJECTTYPE='1'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 f left join obpm_LianCheng_Data.dbo.V_CountyDict f on f.CountyId=c.ITEM_DISTRICT1
on c.ITEM_DISTRICT1=f.ITEM_DICVALUE and f.ITEM_DICTYPE='区域'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g
on c.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块' on c.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h
@ -72,7 +71,7 @@ select
, a.ProjectID , a.ProjectID
, c.ITEM_RANAME , c.ITEM_RANAME
, c.ITEM_RAADRESS , c.ITEM_RAADRESS
, f.ITEM_DICTEXT , f.CountyName
, g.ITEM_DICTEXT , g.ITEM_DICTEXT
, h.ITEM_DICTEXT , h.ITEM_DICTEXT
, convert(varchar, null) , convert(varchar, null)
@ -111,9 +110,8 @@ select
, NULL , NULL
from ODS_HOUSINGCASE_DEAL_#lastYearMonth# a from ODS_HOUSINGCASE_DEAL_#lastYearMonth# a
left join obpm_LianCheng_Data.dbo.TLK_小区信息管理 c left join obpm_LianCheng_Data.dbo.TLK_小区信息管理 c
on a.ProjectID = c.ITEM_AIRAID and c.ITEM_ISBUILDINDEX='1' and c.ITEM_RUNNINGSTATE=1 and c.ITEM_PROJECTTYPE='1' on a.ProjectID = c.ITEM_AIRAID and c.ITEM_ISBUILDINDEX='1' and c.ITEM_PROJECTTYPE='1'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 f left join obpm_LianCheng_Data.dbo.V_CountyDict f on f.CountyId=c.ITEM_DISTRICT1
on c.ITEM_DISTRICT1=f.ITEM_DICVALUE and f.ITEM_DICTYPE='区域'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g
on c.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块' on c.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h
@ -176,7 +174,7 @@ create table #DWA_PROJECTBASEPRICE_IMDT_STEP_1
---规则修改：链家1和链家2调价幅度，status in (1,2) 都纳入计算范围 ---规则修改：链家1和链家2调价幅度，status in (1,2) 都纳入计算范围
insert into #DWA_PROJECTBASEPRICE_IMDT_STEP_1 insert into #DWA_PROJECTBASEPRICE_IMDT_STEP_1
select a.ITEM_AIRAID, a.ITEM_RANAME, a.ITEM_RAADRESS,f.ITEM_DICTEXT , g.ITEM_DICTEXT, h.ITEM_DICTEXT, a.ITEM_ISBUILDINDEX, a.ITEM_GAINCALCULATION, a.ITEM_RUNNINGSTATE, select a.ITEM_AIRAID, a.ITEM_RANAME, a.ITEM_RAADRESS,f.CountyName , g.ITEM_DICTEXT, h.ITEM_DICTEXT, a.ITEM_ISBUILDINDEX, a.ITEM_GAINCALCULATION, a.ITEM_RUNNINGSTATE,
d.BasePrice, b.PriceUnitAdj, b.Visited_Num, d.BasePrice, b.PriceUnitAdj, b.Visited_Num,
b.First_Visit_Time, b.Visited_Num_15, b.Visited_Num_30, c.PriceDealMean_1, c.PriceDealMax_1, c.SumDeal_1, b.First_Visit_Time, b.Visited_Num_15, b.Visited_Num_30, c.PriceDealMean_1, c.PriceDealMax_1, c.SumDeal_1,
b.PriceDealMean, b.PriceDealMax, b.SumDeal, b.PriceListedMin, b.PriceCase1_ToAI_Pst, b.PriceCase2_ToAI_Pst, b.PriceDealMean, b.PriceDealMax, b.SumDeal, b.PriceListedMin, b.PriceCase1_ToAI_Pst, b.PriceCase2_ToAI_Pst,
@ -188,8 +186,7 @@ select a.ITEM_AIRAID, a.ITEM_RANAME, a.ITEM_RAADRESS,f.ITEM_DICTEXT , g.ITEM_DIC
else 0 end as PriceCase2_ToLst_0, else 0 end as PriceCase2_ToLst_0,
b.PriceCase2Adj_0 b.PriceCase2Adj_0
from obpm_LianCheng_Data.dbo.TLK_小区信息管理 a from obpm_LianCheng_Data.dbo.TLK_小区信息管理 a
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 f left join obpm_LianCheng_Data.dbo.V_CountyDict f on f.CountyId=a.ITEM_DISTRICT1
on a.ITEM_DISTRICT1=f.ITEM_DICVALUE and f.ITEM_DICTYPE='区域'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g
on a.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块' on a.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h
@ -223,7 +220,7 @@ left join (
from DW_HOUSINGCASE_COMM_#lastYearMonth# group by ProjectID from DW_HOUSINGCASE_COMM_#lastYearMonth# group by ProjectID
) c on a.ITEM_AIRAID = c.ProjectID ) c on a.ITEM_AIRAID = c.ProjectID
left join ODS_PROJECT_PRICE_INFO_#lastYearMonth# d on a.ITEM_AIRAID = d.ProjectID left join ODS_PROJECT_PRICE_INFO_#lastYearMonth# d on a.ITEM_AIRAID = d.ProjectID
where a.ITEM_RUNNINGSTATE=1 and a.ITEM_ISBUILDINDEX='1' and a.ITEM_PROJECTTYPE='1' and d.Status=1; where a.ITEM_ISBUILDINDEX='1' and a.ITEM_PROJECTTYPE='1' and d.Status=1;
----第二步；根据案例自动计算的小区涨跌幅 ----第二步；根据案例自动计算的小区涨跌幅
create table #DWA_PROJECTBASEPRICE_IMDT_STEP_2 create table #DWA_PROJECTBASEPRICE_IMDT_STEP_2
@ -330,7 +327,7 @@ create table #DWA_PROJECTBASEPRICE_IMDT_STEP_3
); );
SELECT A.ITEM_AIRAID as ProjectID, g.ITEM_DICTEXT as Block, f.ITEM_DICTEXT as County, h.ITEM_DICTEXT as ProjectLevel, A.item_ProjectTypeDtl as ProjectTypeDtl, A.item_BindClassID as BindClassID, B.ProjectID AS BindProjID, B.VOPPB AS Bind_Proj_Pst, SELECT A.ITEM_AIRAID as ProjectID, g.ITEM_DICTEXT as Block, f.CountyName as County, h.ITEM_DICTEXT as ProjectLevel, A.item_ProjectTypeDtl as ProjectTypeDtl, A.item_BindClassID as BindClassID, B.ProjectID AS BindProjID, B.VOPPB AS Bind_Proj_Pst,
CASE WHEN C.ProjectID IS NOT NULL THEN C.VOPPBT CASE WHEN C.ProjectID IS NOT NULL THEN C.VOPPBT
WHEN B.ProjectID IS NOT NULL AND D.BasePrice IS NOT NULL THEN '8505' END AS VOPPAT, WHEN B.ProjectID IS NOT NULL AND D.BasePrice IS NOT NULL THEN '8505' END AS VOPPAT,
CASE WHEN C.ProjectID IS NOT NULL THEN C.VOPPB CASE WHEN C.ProjectID IS NOT NULL THEN C.VOPPB
@ -338,8 +335,7 @@ SELECT A.ITEM_AIRAID as ProjectID, g.ITEM_DICTEXT as Block, f.ITEM_DICTEXT as Co
D.BasePrice D.BasePrice
INTO #TempBindProjID INTO #TempBindProjID
FROM obpm_LianCheng_Data.dbo.TLK_小区信息管理 a FROM obpm_LianCheng_Data.dbo.TLK_小区信息管理 a
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 f left join obpm_LianCheng_Data.dbo.V_CountyDict f on f.CountyId=a.ITEM_DISTRICT1
on a.ITEM_DISTRICT1=f.ITEM_DICVALUE and f.ITEM_DICTYPE='区域'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 g
on a.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块' on a.ITEM_SECTOR121=g.ITEM_DICVALUE and g.ITEM_DICTYPE='板块'
left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 h
@ -350,7 +346,7 @@ LEFT JOIN (SELECT ProjectID, VOPPBT, VOPPB FROM #DWA_PROJECTBASEPRICE_IMDT_STEP_
ON A.ITEM_AIRAID = C.ProjectID ON A.ITEM_AIRAID = C.ProjectID
LEFT JOIN ODS_PROJECT_PRICE_INFO_#lastYearMonth# D LEFT JOIN ODS_PROJECT_PRICE_INFO_#lastYearMonth# D
ON A.ITEM_AIRAID = D.ProjectID AND D.Status=1 ON A.ITEM_AIRAID = D.ProjectID AND D.Status=1
where a.ITEM_ISBUILDINDEX='1' and a.ITEM_RUNNINGSTATE='1' and a.ITEM_PROJECTTYPE='1'; where a.ITEM_ISBUILDINDEX='1' and a.ITEM_PROJECTTYPE='1';
-- 2.板块+绑定 -- 2.板块+绑定
SELECT A.ProjectID, A.Block, A.County, A.ProjectLevel, A.ProjectTypeDtl, A.BindClassID, A.BindProjID, A.Bind_Proj_Pst, SELECT A.ProjectID, A.Block, A.County, A.ProjectLevel, A.ProjectTypeDtl, A.BindClassID, A.BindProjID, A.Bind_Proj_Pst,
@ -455,7 +451,6 @@ create table #DWA_PROJECTBASEPRICE_IMDT_STEP_4
, PriceNote nvarchar(1024) , PriceNote nvarchar(1024)
); );
INSERT INTO #DWA_PROJECTBASEPRICE_IMDT_STEP_4 INSERT INTO #DWA_PROJECTBASEPRICE_IMDT_STEP_4
SELECT A.ITEM_AIRAID, A.ITEM_RALABLE, g.ITEM_DICTEXT, i.ITEM_DICTEXT, A.item_ProjectTypeDtl, h.ITEM_DICTEXT, A.ITEM_MAINCOMPLETIONYEAR, A.item_MainArea, SELECT A.ITEM_AIRAID, A.ITEM_RALABLE, g.ITEM_DICTEXT, i.ITEM_DICTEXT, A.item_ProjectTypeDtl, h.ITEM_DICTEXT, A.ITEM_MAINCOMPLETIONYEAR, A.item_MainArea,
A.item_AreaCoff, A.item_YearCoff, D.PriceNote A.item_AreaCoff, A.item_YearCoff, D.PriceNote
@ -468,9 +463,10 @@ left join obpm_LianCheng_Data.dbo.TLK_字典数据信息 i
on a.ITEM_RAType=g.ITEM_DICVALUE and i.ITEM_DICTYPE='小区类型' on a.ITEM_RAType=g.ITEM_DICVALUE and i.ITEM_DICTYPE='小区类型'
LEFT JOIN ODS_PROJECT_PRICE_INFO_#lastYearMonth# D LEFT JOIN ODS_PROJECT_PRICE_INFO_#lastYearMonth# D
ON A.ITEM_AIRAID = D.ProjectID ON A.ITEM_AIRAID = D.ProjectID
where A.ITEM_PROJECTTYPE='1' and a.ITEM_RUNNINGSTATE='1' and a.ITEM_ISBUILDINDEX='1' and D.Status=1; where A.ITEM_PROJECTTYPE='1' and a.ITEM_ISBUILDINDEX='1' and D.Status=1;
----第五步；整合到结果表 ----第五步；整合到结果表
INSERT INTO DWA_PROJECTBASEPRICE_IMDT_#yearMonth# INSERT INTO DWA_PROJECTBASEPRICE_IMDT_#yearMonth#
SELECT A.ProjectID, A.ProjectName, A.ProjectAddr, A.County, A.Block, A.Loop, a.IsIndxGen, a.IsPstCalc, a.StatusRun, D.ProjectSPLabel, D.PropertyType, D.ProjectType, SELECT A.ProjectID, A.ProjectName, A.ProjectAddr, A.County, A.Block, A.Loop, a.IsIndxGen, a.IsPstCalc, a.StatusRun, D.ProjectSPLabel, D.PropertyType, D.ProjectType,
D.ProjectTypeDtl, D.ProjectLevel, D.[Year], D.MainArea, ISNULL(D.AreaCoff,1), ISNULL(D.YearCoff,1), D.PriceNote, D.ProjectTypeDtl, D.ProjectLevel, D.[Year], D.MainArea, ISNULL(D.AreaCoff,1), ISNULL(D.YearCoff,1), D.PriceNote,

1
ruoyi/src/test/java/com/uvaluation/compute/ResidenceSaleBasePriceTests.java
View File

@ -57,5 +57,4 @@ public class ResidenceSaleBasePriceTests {
artificialResidenceSalePriceService.batchImport(202007, list); artificialResidenceSalePriceService.batchImport(202007, list);
} }
} }