Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
-1
@@ -64,7 +64,7 @@ class CcbCommonUtils {
|
|||||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
citys = CcbCommonUtils.citys_92
|
citys = CcbCommonUtils.citys_all
|
||||||
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -59,7 +59,7 @@ class ExportOracleDataTest {
|
|||||||
exportCityPrice(curMonth)//无城市区分
|
exportCityPrice(curMonth)//无城市区分
|
||||||
exportRegionPrice(curMonth)//无城市区分
|
exportRegionPrice(curMonth)//无城市区分
|
||||||
|
|
||||||
exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分
|
// exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分
|
||||||
exportCommunityBasePrice(curMonth)//无城市区分
|
exportCommunityBasePrice(curMonth)//无城市区分
|
||||||
|
|
||||||
exportCommunityPdescribeGj(curMonth)//无城市区分
|
exportCommunityPdescribeGj(curMonth)//无城市区分
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
|||||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||||
|
|
||||||
//添加自己库中的人工指导价
|
//添加自己库中的人工指导价
|
||||||
def prices = CcbCommonUtils.findPersonPrice(city, "2022-11-25", "2022-12-24")
|
def prices = CcbCommonUtils.findPersonPrice(city, "2022-12-24", "2023-01-25")
|
||||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||||
if(prices){
|
if(prices){
|
||||||
def distMap = getDistrictMap(city)
|
def distMap = getDistrictMap(city)
|
||||||
|
|||||||
@@ -335,8 +335,15 @@ public class DbUtils{
|
|||||||
keys.append("lng2", 1)
|
keys.append("lng2", 1)
|
||||||
keys.append("estate_type2", 1)
|
keys.append("estate_type2", 1)
|
||||||
DbUtils.SEAWEED_SLAVE.find(query, keys).each {BasicDBObject dbo->
|
DbUtils.SEAWEED_SLAVE.find(query, keys).each {BasicDBObject dbo->
|
||||||
|
|
||||||
if(!district._id || dbo._id != district._id){
|
if(!district._id || dbo._id != district._id){
|
||||||
districts << dbo
|
if(district.estateType){
|
||||||
|
if(dbo.estate_type2 == district.estateType){
|
||||||
|
districts << dbo
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
districts << dbo
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user