Merge branch 'script_gj' into 'master'

建行类型字段放最后一列

See merge request !980
This commit is contained in:
2024-10-21 15:07:58 +08:00
@@ -1457,45 +1457,45 @@ class ExportDistrictRongHe extends BaseBatch{
println "community_p_describe_gj 上传Ftp完成......" println "community_p_describe_gj 上传Ftp完成......"
} }
def exportGuideStatistics(time){ // def exportGuideStatistics(time){
//
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" // def fileName = "/home/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){ // if(CommonDatautils.isWindow()){
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" // fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
} // }
def headers = [] // def headers = []
def allRows = [] // def allRows = []
//
for(def city : citys) { // for(def city : citys) {
def cityCode = cityCodeMap.get(city) // def cityCode = cityCodeMap.get(city)
def sql = null; // def sql = null;
if(CcbCommonUtils.citys_92.contains(city)){ // if(CcbCommonUtils.citys_92.contains(city)){
sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}' and year_month=${time}"; // sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}' and year_month=${time}";
}else{ // }else{
sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}'"; // sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}'";
} // }
//
sqlInstance.eachRow(sql, { r -> // sqlInstance.eachRow(sql, { r ->
def data = [] // def data = []
data << r.MODEL_TYPE // data << r.MODEL_TYPE
data << r.CITYID // data << r.CITYID
data << r.CITYNAME // data << r.CITYNAME
data << r.YEAR_MONTH // data << r.YEAR_MONTH
data << r.COMM_SUM_COUNT // data << r.COMM_SUM_COUNT
data << r.COMM_COUNT // data << r.COMM_COUNT
data << r.RATIO // data << r.RATIO
data << r.TYPE // data << r.TYPE
allRows << data // allRows << data
}); // });
} // }
println allRows.size() // println allRows.size()
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); // FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
//
println "guide_statistics 数据文件输出完成......" // println "guide_statistics 数据文件输出完成......"
CcbFtpUtils.ftpUpload("rh", fileName, curDate) // CcbFtpUtils.ftpUpload("rh", fileName, curDate)
println "guide_statistics 上传Ftp完成......" // println "guide_statistics 上传Ftp完成......"
} // }
def exportPgGuideStatistics(time){ def exportPgGuideStatistics(time){
@@ -1514,7 +1514,6 @@ class ExportDistrictRongHe extends BaseBatch{
pgsqlInstance.eachRow(sql, { r -> pgsqlInstance.eachRow(sql, { r ->
def data = [] def data = []
data << r.gujia_model_type
data << r.urbn_id data << r.urbn_id
data << r.urbn_nm data << r.urbn_nm
data << r.gujia_clc_yrmo data << r.gujia_clc_yrmo
@@ -1522,6 +1521,7 @@ class ExportDistrictRongHe extends BaseBatch{
data << r.gujia_comm_count data << r.gujia_comm_count
data << r.gujia_ratio data << r.gujia_ratio
data << r.gujia_type data << r.gujia_type
data << r.gujia_model_type
allRows << data allRows << data
}); });
} }