|
@@ -28,12 +28,14 @@ entname 企业名称
|
|
|
area 区域多值","号隔开
|
|
|
lower 下限单位万
|
|
|
upper 上限单位万
|
|
|
+pagenum 页码
|
|
|
+pagesize每页数量
|
|
|
*/
|
|
|
func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pagesize int) []map[string]interface{} {
|
|
|
if pagenum < 1 {
|
|
|
pagenum = 1
|
|
|
}
|
|
|
- mastquery := getBidSearchQuery(area, lower, upper)
|
|
|
+ mastquery := getSearchQuery(area, lower, upper)
|
|
|
list := *elastic.GetByNgram(
|
|
|
"projectset", "projectset",
|
|
|
entname, mastquery,
|
|
@@ -43,7 +45,7 @@ func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pag
|
|
|
return list
|
|
|
}
|
|
|
|
|
|
-func getBidSearchQuery(area string, lower, upper int) string {
|
|
|
+func getSearchQuery(area string, lower, upper int) string {
|
|
|
query := ``
|
|
|
if area != "" {
|
|
|
query += `{"terms":{"area":[`
|