From 9743a72aeb493e86a8ce8f4776ac49e2bcb44c84 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 20 Dec 2022 17:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExportOracleAllDataTest.groovy | 6 ++--- .../ccbevaluation/FjwPricePkCcbPrice.groovy | 22 ++++++++++++++++++- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 6 ++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy index 6c2dbcf26..42f71fc0a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy @@ -73,12 +73,12 @@ class ExportOracleAllDataTest { // exportCommunityBasePriceGj()// // exportCommunityBasePrice()// // - exportCommunityPdescribeGj()// +// exportCommunityPdescribeGj()// // exportCommCaseDetailGj()// // // def curDate = curMonth.toString()+"28" // // ok文件 -// exportInOk() + exportInOk() // SSHHelperTest jschCommand = new SSHHelperTest(); // System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); @@ -1207,7 +1207,7 @@ class ExportOracleAllDataTest { } def exportInOk(){ - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"15" Vector files = CcbFtpTestUtils.listFileNames(null, curDate) Iterator fileVec = files.iterator() def fileRows = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy index b28516075..9c6b96508 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy @@ -29,7 +29,9 @@ class FjwPricePkCcbPrice { // task.updatePrice() // task.addFjwPrice() // task.addCcbPrice() - task.addMarketPrice() + + task.addCcbPriceFromGuided() +// task.addMarketPrice() } def addMarketPrice(){ @@ -66,6 +68,24 @@ class FjwPricePkCcbPrice { }) } + def addCcbPriceFromGuided(){ + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\人工指导价2.xls",{d-> + if(d['B'] && !d['O']){ + def cityId = d['D'] + def dist = CommonDatautils.findDistrictById(d['B']) + if(dist){ + def map = getCommunityBasePriceGjByCommid(cityId, dist._id.toString(), 202211) + if(map){ + d['O'] = map.avg_price + d['P'] = map.calc_type + d['Q'] = map.credit + } + } + } + }) + } + def updatePrice(){ def index = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index 027e71834..295ab8915 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap @BatchOwner(Watcher.GaoJuan) class ThirdPartyPriceBatch extends BaseBatch { - def sDate= 202210//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - def startDate = 202208 - def endDate = 202210 + def sDate= 202211//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def startDate = 202209 + def endDate = 202211 // def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43")