Merge branch 'script_gj' into 'master'

update

See merge request !1077
This commit is contained in:
2025-02-14 17:56:36 +08:00
@@ -119,7 +119,7 @@ class DistrictFieldAddBatch extends BaseBatch{
}
for(def c : citys){
def totalCount = CommonDatautils.findAllDistrictCount("district", c)
if(totalCount){
// rh_analysRets = addFieldFromRonghe(c, totalCount, rh_analysRets)//融合
@@ -330,7 +330,9 @@ class DistrictFieldAddBatch extends BaseBatch{
def newVal = null
if(seaweedfield == "estate_charge"){
newVal = FiledStrand.processEstateCharge(c, FiledStrand.getNumber(esVal), dist.estate_type2)
newVal = newVal.toString()
if(newVal) {
newVal = newVal.toString()
}
}
if(seaweedfield == "build_date" || seaweedfield == "live_date"){
newVal = FiledStrand.processFinishBuildingDate(esVal)