Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-02-01 17:29:26 +08:00
4 changed files with 11 additions and 4 deletions
@@ -64,7 +64,7 @@ class CcbCommonUtils {
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}
}else{
citys = CcbCommonUtils.citys_92
citys = CcbCommonUtils.citys_all
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}
@@ -59,7 +59,7 @@ class ExportOracleDataTest {
exportCityPrice(curMonth)//无城市区分
exportRegionPrice(curMonth)//无城市区分
exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分
// exportCommunityBasePriceGj(curMonth)//已合下面的合并 //无城市区分
exportCommunityBasePrice(curMonth)//无城市区分
exportCommunityPdescribeGj(curMonth)//无城市区分
@@ -47,7 +47,7 @@ class GuiDingPriceBatch extends BaseBatch{
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")
if(prices){
def distMap = getDistrictMap(city)
@@ -335,8 +335,15 @@ public class DbUtils{
keys.append("lng2", 1)
keys.append("estate_type2", 1)
DbUtils.SEAWEED_SLAVE.find(query, keys).each {BasicDBObject dbo->
if(!district._id || dbo._id != district._id){
districts << dbo
if(district.estateType){
if(dbo.estate_type2 == district.estateType){
districts << dbo
}
}else{
districts << dbo
}
}
}
}