Merge branch 'script_gj' into 'master'

修改bug

See merge request !977
This commit is contained in:
2024-10-15 14:29:07 +08:00
@@ -36,7 +36,7 @@ class RelatedTaiWanBatch extends BaseBatch{
@Override
public void process(Object args) {
createDatas() //企业库获取涉台园区企业
// createDatas() //企业库获取涉台园区企业
updateRangeByPoint() //更改企业所在自贸区
export() //导出数据
}
@@ -57,12 +57,14 @@ class RelatedTaiWanBatch extends BaseBatch{
println dbcursor.count()
for(def r : dbcursor){
def resKey = null
for(def m : zimaoqu_range_datas){
if(r.lon && r.lat){
for(def m : zimaoqu_range_datas){
// def flag = InsidePolygon.isInArea(r.lon, r.lat, InsidePolygon.createPoint5(m.shape))
def flag = InsidePolygon.isPtInPoly(r.lon, r.lat, InsidePolygon.createPoint5(m.shape))
if(flag){
resKey = m.name
break
def flag = InsidePolygon.isPtInPoly(r.lon, r.lat, InsidePolygon.createPoint5(m.shape))
if(flag){
resKey = m.name
break
}
}
}
if(resKey){