@ -22,11 +22,11 @@ func JavaOrgtreeProcBatch(datas []MySwagger.Data) {
json . Unmarshal ( [ ] byte ( datas [ no ] . Data ) , & jsonData )
var id = strconv. FormatFloat ( jsonData[ "ORG_ID" ] . ( float64) , 'f' , - 1 , 64 )
var id = jsonData[ "ORG_ID" ] . ( string )
IDs = append ( IDs , strings . ToLower ( id ) )
if Contains ( areaIDs , jsonData [ " area_code "] . ( string ) ) == - 1 {
areaIDs = append ( areaIDs , jsonData [ " area_code "] . ( string ) )
if Contains ( areaIDs , jsonData [ " AREA_CODE "] . ( string ) ) == - 1 {
areaIDs = append ( areaIDs , jsonData [ " AREA_CODE "] . ( string ) )
}
}
@ -65,45 +65,50 @@ func JavaOrgtreeProcBatch(datas []MySwagger.Data) {
break
}
if orgType != " 1" && orgType != "2" && orgType != "7 " {
if orgType != " 0" && orgType != "7" && orgType != "8 " {
continue
} else {
if orgType == "0" { orgType = "1" }
if orgType == "7" { orgType = "3" }
if orgType == "8" { orgType = "2" }
}
if orgType == "2" {
//默认-1 1:小学, 2:初中, 3:高中, 4:完全中学, 5:九年一贯制, 6:十二年一贯制, 7:大学, 8:职业, 9:幼儿 10: 小幼一体 11: 小幼初一体
switch jsonData [ "school_type" ] . ( float64 ) {
case 1 :
//九年制学校、普通初中、普通高中、其他教育机构、十二年制学校、特殊教育学校、完全中学、小学、幼儿园、职业高中、中等职业学校
switch jsonData [ "DIC_VALUE" ] . ( string ) {
case "小学" :
schoolType = "211"
break
case 2 :
case "普通初中" :
schoolType = "311"
break
case 3 :
case "普通高中" :
schoolType = "342"
break
case 4 :
case "完全中学" :
schoolType = "341"
break
case 5 :
case "九年制学校" :
schoolType = "312"
break
case 6 :
case "十二年制学校" :
schoolType = "345"
break
case 7 :
schoolType = " 411 "
case "其他教育机构" :
schoolType = " 933 "
break
case 8 :
schoolType = " 4 14"
case "特殊教育学校" :
schoolType = " 5 14"
break
case 9 :
case "幼儿园" :
schoolType = "111"
break
case 10 :
schoolType = " 211 "
case "职业高中" :
schoolType = " 365 "
break
case 11 :
schoolType = "3 12 "
case "中等职业学校" :
schoolType = "3 6 1"
break
}
@ -115,15 +120,15 @@ func JavaOrgtreeProcBatch(datas []MySwagger.Data) {
if orgType == "1" {
var areaCode string
if jsonData [ " area_code "] . ( string ) [ 2 : ] == "0000" { //省级
if jsonData [ " AREA_CODE "] . ( string ) [ 2 : ] == "0000" { //省级
areaCode = "100000"
} else if jsonData [ " area_code "] . ( string ) [ 4 : ] == "00" { //市级
} else if jsonData [ " AREA_CODE "] . ( string ) [ 4 : ] == "00" { //市级
areaCode = jsonData [ " area_code "] . ( string ) [ 0 : 2 ] + "0000"
areaCode = jsonData [ " AREA_CODE "] . ( string ) [ 0 : 2 ] + "0000"
} else { //县区级
areaCode = jsonData [ " area_code "] . ( string ) [ 0 : 4 ] + "00"
areaCode = jsonData [ " AREA_CODE "] . ( string ) [ 0 : 4 ] + "00"
//处理直辖市
if areaCode == "110100" {
@ -149,27 +154,18 @@ func JavaOrgtreeProcBatch(datas []MySwagger.Data) {
parentID = parentMap [ areaCode ]
//处理教育部
if jsonData [ " area_code "] . ( string ) == "100000" {
if jsonData [ " AREA_CODE "] . ( string ) == "100000" {
parentID = "0"
}
//delete by zhangjun 2020-07-17
//if parentID==""{
// parentID = DataexDAO.GetParentIDBaseGO(areaCode)
//}
if parentID == "" {
sqls2 = append ( sqls2 , "update t_dataex_orgtree set parent_id =(select id from t_dataex_orgtree where org_type=1 and area_id='" + areaCode + "') where id='" + IDs [ no ] + "'" )
}
} else {
parentID = parentMap [ jsonData [ "area_code" ] . ( string ) ]
//if parentID==""{
// parentID = DataexDAO.GetParentIDBaseGO(jsonData["area_code"].(string))
//}
parentID = parentMap [ jsonData [ "AREA_CODE" ] . ( string ) ]
if parentID == "" {
sqls2 = append ( sqls2 , "update t_dataex_orgtree set parent_id =(select id from t_dataex_orgtree where org_type=1 and area_id='" + jsonData [ " area_code "] . ( string ) + "') where id='" + IDs [ no ] + "'" )
sqls2 = append ( sqls2 , "update t_dataex_orgtree set parent_id =(select id from t_dataex_orgtree where org_type=1 and area_id='" + jsonData [ "AREA_CODE" ] . ( string ) + "') where id='" + IDs [ no ] + "'" )
}
}
}