master
wubin 5 years ago
parent 1fafe58f25
commit fc1e84a083

@ -583,6 +583,23 @@ func GetSchoolCountByCity(c *gin.Context) {
schoolCountArr = append(schoolCountArr, schoolCount)
}
if areaType == "1" {
cityDirectlyCount, err := SchoolService.GetCityDirectlySchoolCount(cityCode)
if err != nil {
c.JSON(http.StatusOK, Model.Res{
Success: false,
Message: err.Error(),
})
return
}
var schoolCount SchoolModel.SchoolCount
schoolCount.AreaCode = cityCode
schoolCount.AreaName = "市直属"
schoolCount.Count = cityDirectlyCount
schoolCountArr = append(schoolCountArr, schoolCount)
}
schoolCountArrByte, _ := json.Marshal(schoolCountArr)
schoolCountArrStr := string(schoolCountArrByte)

@ -511,10 +511,13 @@ func GetBaseAccessTop(areaCode string, topNum string) ([]SchoolModel.BaseAccessT
}
func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(orgIds)
orgIdTerms := elastic.NewTermsQuery("org_id", interfaceArr...)
boolQuery := elastic.NewBoolQuery().Must(orgIdTerms)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, bUseTerm, orgIdTerms)
result, err := esClient.Search().
Index("org_school").
@ -540,3 +543,29 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
}
return orgArr, nil
}
/**
*/
func GetCityDirectlySchoolCount(cityCode string) (int, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
districtCodeTerm := elastic.NewTermQuery("district_code", cityCode)
orgTypeTerm := elastic.NewTermQuery("org_type", "2")
boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
result, err := esClient.Search().
Index("org_school").
Query(boolQuery).
Size(0).
Do(CTX)
if err != nil {
return 0, err
}
return int(result.TotalHits()), nil
}

@ -82,3 +82,8 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
arr, err := SchoolDao.GetOrgInfoByOrgIds(orgIds)
return arr, err
}
func GetCityDirectlySchoolCount(cityCode string) (int, error) {
count, err := SchoolDao.GetCityDirectlySchoolCount(cityCode)
return count, err
}

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save