Merge branch 'script_gj' into 'master'

update

See merge request !1140
This commit is contained in:
2025-04-28 15:02:47 +08:00
@@ -225,7 +225,7 @@ class AutoAddOfficeBatch extends BaseBatch {
} }
def repeatDist(){ def repeatDist(){
def citys = CommonDatautils.findAllCity() def citys = ["南京"]//CommonDatautils.findAllCity().reverse()
def allrets = [] def allrets = []
allrets << [ "城市", "区域", "名称", "别名","计算方式","地址","名称相似度","地址相似度","总相似度"] allrets << [ "城市", "区域", "名称", "别名","计算方式","地址","名称相似度","地址相似度","总相似度"]
def index = 0 def index = 0
@@ -241,7 +241,7 @@ class AutoAddOfficeBatch extends BaseBatch {
println "${index}"+ c +" 运A行完成 "+rets.size() println "${index}"+ c +" 运A行完成 "+rets.size()
if (CommonDatautils.isWindow()) { if (CommonDatautils.isWindow()) {
ExcelUtils.write("D://数据//小区/重复可疑小区-${c}.xlsx", allrets, "数据") ExcelUtils.write("D://数据//小区//重复可疑小区-${c}.xlsx", allrets, "数据")
}else{ }else{
ExcelUtils.write("/home/goojia/gj/重复可疑小区-${c}.xlsx", allrets, "数据") ExcelUtils.write("/home/goojia/gj/重复可疑小区-${c}.xlsx", allrets, "数据")
} }
@@ -289,7 +289,7 @@ class AutoAddOfficeBatch extends BaseBatch {
if(similar.alias){ if(similar.alias){
ailas_str = similar.alias.join(",") ailas_str = similar.alias.join(",")
} }
def newPriceMap = fjwPriceMap.get(o1._id.toString()) def newPriceMap = fjwPriceMap.get(similar._id.toString())
def new_price = null def new_price = null
if(newPriceMap){ if(newPriceMap){
new_price = newPriceMap.calc_type new_price = newPriceMap.calc_type