Merge branch 'script_gj' into 'master'

时间修改

See merge request !310
This commit is contained in:
2022-05-22 17:39:33 +08:00
2 changed files with 34 additions and 9 deletions
@@ -38,8 +38,8 @@ class ExportOracleData {
exportCommunityBuileType() exportCommunityBuileType()
exportThirdPartyPrice2(lastMonth) exportThirdPartyPrice2(lastMonth)
exportBigdataForsale("2022-03-19") exportBigdataForsale("2022-04-19")
exportBigdataDeal("2022-03-01") exportBigdataDeal("2022-04-01")
//计算结果相关 //计算结果相关
@@ -590,8 +590,8 @@ class CommonDatautils {
} }
public static def findDistrict(String city, String region, String name, String cat){ public static def findDistrictCount(String city, String region, String name, String cat){
DBObject q = new BasicDBObject(); DBObject q = new BasicDBObject();
q.put("city", city); q.put("city", city);
if(region){ if(region){
@@ -602,7 +602,24 @@ class CommonDatautils {
q.put("cat", cat) q.put("cat", cat)
q.put("status", 0) q.put("status", 0)
def count = getDataStoreConnection().count(q);
return count;
}
public static def findDistrict(String city, String region, String name, String cat){
DBObject q = new BasicDBObject();
q.put("city", city);
if(region){
q.put("region", region);
}
q.put("name", name);
q.put("cat", cat)
q.put("status", 0)
DSCursor cursor = getDataStoreConnection().find(q); DSCursor cursor = getDataStoreConnection().find(q);
if(cursor){ if(cursor){
for(def obj : cursor){ for(def obj : cursor){
@@ -613,6 +630,7 @@ class CommonDatautils {
} }
public static def findDistrictList(String city, String region, String name, String cat){ public static def findDistrictList(String city, String region, String name, String cat){
DBObject q = new BasicDBObject(); DBObject q = new BasicDBObject();
@@ -837,12 +855,18 @@ class CommonDatautils {
keys.put("finish_building_date", 1) keys.put("finish_building_date", 1)
keys.put("mapping_alias", 1) keys.put("mapping_alias", 1)
keys.put("sid", 1) keys.put("sid", 1)
DSCursor cursor = getDataStoreConnection().find(q, keys); try{
if(cursor){ DSCursor cursor = getDataStoreConnection().find(q, keys);
for(def obj : cursor){ if(cursor){
return obj; for(def obj : cursor){
return obj;
}
} }
}catch(Exception e){
println "error_id:"+id
e.printStackTrace()
} }
return null; return null;
} }
@@ -2398,6 +2422,7 @@ class CommonDatautils {
q.put("block", block); q.put("block", block);
} }
q.put("cat", cat); q.put("cat", cat);
q.put("status",0)
def cur = getDataStoreConnection().find(q); def cur = getDataStoreConnection().find(q);
return cur.count(); return cur.count();
} }