cc

src/jfw/modules/entsesearch/src/config.json

@@ -12,6 +12,7 @@
     "weixinrpc": "127.0.0.1:83",
     "cacheflag": false,
     "agreement": "http",
-    "recommendEntLimit":"50"
+    "recommendEntLimit":"50",
+    "followPushRpc": "127.0.0.1:8759"
 
 }

src/jfw/modules/entsesearch/src/search/entsesearch.go

@@ -3,9 +3,10 @@ package search
 import (
 	"fmt"
 	"github.com/go-xweb/xweb"
-	"qfw/util/elastic"
+	//"qfw/util/elastic"
 	"config"
 	"strconv"
+	"jfw/jylabutil"
 )
 
 type EntSeSearch struct {
@@ -25,22 +26,38 @@ func (e *EntSeSearch) ToSearch() error{
 }
 
 func (e *EntSeSearch) RecList() {
-	fmt.Println("entName", e.GetString("entName"))
 	var entName = e.GetString("entName")
-	if entName!=""{
-		limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
-		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
-		if r!=nil && len(*r) != 0{
-			fmt.Println("RecList",r)
-			e.ServeJson(map[string]interface{}{
-				"recList": r,
-			})
-		}
+	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	//if entName!=""{
+	//	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	//	r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
+	//	if r!=nil && len(*r) != 0{
+	//		fmt.Println("RecList",r)
+	//		e.ServeJson(map[string]interface{}{
+	//			"recList": r,
+	//		})
+	//	}
+	//}
+	fmt.Println("11111111111111111",entName,limit)
+	re := jylabutil.GetEenNameImmediate(entName,limit)
+	fmt.Println("RecList",re)
+	if re!=nil && len(re) != 0{
+		e.ServeJson(map[string]interface{}{
+			"recList": re,
+		})
 	}
 }
 
 func (e *EntSeSearch) ProList() {
+	var searchname = e.GetString("searchname")
+	var scope = e.GetString("scope")
+	//var money = e.GetString("money")
+	var money_from,_ = strconv.Atoi(e.GetString("money_from"))
+	var money_to,_ = strconv.Atoi(e.GetString("money_to"))
+	fmt.Println(searchname,scope,money_from,money_to)
+	proMap := jylabutil.GetProjectByEntName(searchname,scope,money_from,money_to,1,10)
+	fmt.Println("------------------",proMap)
 	e.ServeJson(map[string]interface{}{
-
+		"proList": proMap,
 	})
 }

src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html

@@ -440,7 +440,7 @@
                     if(typeof (r.recList)!="undefined"){
                         var recList = r.recList;
                         for(var i=0;i<recList.length;i++){
-                            var entName = recList[i].winner;
+                            var entName = recList[i].name;
                             if(entName!="" && entName.length>20){
                                 entName = entName.substr(0,20)+"...";
                             }
@@ -502,12 +502,16 @@
             $(".money .btn").addClass("active_m");
         });
 
+        //搜索企业项目信息
         $(".jydqsure").click(function () {
             formSubmit();
         });
+
+        $(".tubiao").click(function(){
+            formSubmit();
+        });
         //确定
 		function formSubmit(){
-            //processVal($(".searchname").val());
 			var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
             var dataObj = {};
 
@@ -539,6 +543,8 @@
             dataObj["money"] = money;
             dataObj["money_from"] = money_from;
             dataObj["money_to"] = money_to;
+            dataObj["pagenum"] = "1";
+            dataObj["pagesize"] = "10";
 
 //			  $("#searchform [name='scope']").val(this.setScope());
 //            $("#searchform [name='money']").val(money);
@@ -546,27 +552,23 @@
 //            $("#searchform [name='money_to']").val(money_to);
 //            $(".searchform").submit();
 
-            $.post("/jylab/entsesearch/recList",dataObj,function(r){
+            $.post("/jylab/entsesearch/proList",dataObj,function(r){
                 if(r){
-                    if(typeof (r.recList)!="undefined"){
-                        var recList = r.recList;
-                        for(var i=0;i<recList.length;i++){
-                            var entName = recList[i].winner;
-                            if(entName!="" && entName.length>20){
-                                entName = entName.substr(0,20)+"...";
-                            }
-                            var obj=$("<div class='rec'>"+entName+"</div>");
-                            $("#recList").append(obj);
+                    console.log(r);
+                    if(typeof (r.proList)!="undefined"){
+                        var proList = r.proList;
+                        for(var i=0;i<proList.length;i++){
+							var bidamount = proList[i].bidamount/10000;
+							var projectname = proList[i].projectname;
+                            var zbtime = proList[i].jgtime;
+                            var obj =$("<tr><td>"+(i+1)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
+                            $("#searchlist tbody").append(obj);
                         }
                     }
                     shaixuanHide();
                 }
             });
 		}
-
-        function processVal(value){
-            $("[name='searchvalue']").val(value.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
-        }
     });
 
 	//显示筛选过滤选择