wangshan 8 gadi atpakaļ
vecāks
revīzija
b95f2bdcf4

+ 5 - 5
src/jfw/jylabutil/entsearch.go

@@ -36,7 +36,7 @@ upper	上限单位万
 pagenum	页码
 pagesize每页数量
 */
-func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pagesize int) []map[string]interface{} {
+func GetProjectByEntName(entname string, area string, lower, upper float64, pagenum, pagesize int) []map[string]interface{} {
 	if pagenum < 1 {
 		pagenum = 1
 	}
@@ -50,7 +50,7 @@ func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pag
 	return list
 }
 
-func getSearchQuery(area string, lower, upper int) string {
+func getSearchQuery(area string, lower, upper float64) string {
 	query := ``
 	if area != "" {
 		query += `{"terms":{"area":[`
@@ -66,19 +66,19 @@ func getSearchQuery(area string, lower, upper int) string {
 		if len(query) > 0 {
 			query += ","
 		}
-		query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `,"lte":` + fmt.Sprint(upper*10000) + `}}}`
+		query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower) + `,"lte":` + fmt.Sprint(upper) + `}}}`
 	} else {
 		if lower > 0 {
 			if len(query) > 0 {
 				query += ","
 			}
-			query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `}}}`
+			query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower) + `}}}`
 		}
 		if upper > 0 {
 			if len(query) > 0 {
 				query += ","
 			}
-			query += `{"range":{"bidamount":{"lte":` + fmt.Sprint(upper*10000) + `}}}`
+			query += `{"range":{"bidamount":{"lte":` + fmt.Sprint(upper) + `}}}`
 		}
 	}
 	return query

+ 0 - 1
src/web/staticres/js/biddingSearch.js

@@ -188,7 +188,6 @@ $(function() {
 			$tabDIv = $(".tabContainer");
 
 		$tab.on("click", function() {
-			console.log(submitflag+"----)))))")
 			if(submitflag){
 				$(this).find("a").addClass("active").parent().siblings().find("a").removeClass("active");
 				$tabDIv.eq($(this).index()).show().siblings().not(".tabTitle").hide()