diff --git a/dsBigData/Business/School/SchoolDao/SchoolDao.go b/dsBigData/Business/School/SchoolDao/SchoolDao.go index 28834996..0d09d06d 100644 --- a/dsBigData/Business/School/SchoolDao/SchoolDao.go +++ b/dsBigData/Business/School/SchoolDao/SchoolDao.go @@ -42,8 +42,10 @@ func PageEduAssistInfoByDistrictCode(districtCode string) ([]SchoolModel.EduAssi resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { var eduAssist SchoolModel.EduAssist - eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str - eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + //eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str + //eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str + eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str eduAssistArr = append(eduAssistArr, eduAssist) } return eduAssistArr, nil @@ -84,8 +86,10 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { var school SchoolModel.School - school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str - school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + //school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str + //school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str + school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str schoolArr = append(schoolArr, school) } return schoolArr, nil @@ -536,8 +540,10 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) { resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { var org SchoolModel.Org - org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str - org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + //org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str + //org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str + org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str + org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str orgArr = append(orgArr, org) } diff --git a/dsBigData/build/dsBigData b/dsBigData/build/dsBigData index e119168a..262dd1fb 100644 Binary files a/dsBigData/build/dsBigData and b/dsBigData/build/dsBigData differ