|
@@ -6,7 +6,6 @@ import (
|
|
"github.com/go-xweb/xweb"
|
|
"github.com/go-xweb/xweb"
|
|
"github.com/p/mahonia"
|
|
"github.com/p/mahonia"
|
|
"html/template"
|
|
"html/template"
|
|
- "log"
|
|
|
|
"qfw/coreutil"
|
|
"qfw/coreutil"
|
|
"qfw/mobile"
|
|
"qfw/mobile"
|
|
. "qfw/util"
|
|
. "qfw/util"
|
|
@@ -90,14 +89,13 @@ func FormatData(data *[]map[string]interface{}, action *xweb.Action) string {
|
|
"EstDate": estDate,
|
|
"EstDate": estDate,
|
|
"OpStateName": fmt.Sprint(v["OpStateName"]),
|
|
"OpStateName": fmt.Sprint(v["OpStateName"]),
|
|
"status": "n",
|
|
"status": "n",
|
|
|
|
+ "excDirect": fmt.Sprint(v["excDirect"]),
|
|
}
|
|
}
|
|
//是否关注
|
|
//是否关注
|
|
entId := tmp["_id"]
|
|
entId := tmp["_id"]
|
|
userId := action.GetSession("userId").(string)
|
|
userId := action.GetSession("userId").(string)
|
|
if userId != "" {
|
|
if userId != "" {
|
|
- log.Println(userId)
|
|
|
|
if Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
|
|
if Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
|
|
- log.Println("进入")
|
|
|
|
tmp["status"] = "y"
|
|
tmp["status"] = "y"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -425,7 +423,7 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
|
|
"_source": [
|
|
"_source": [
|
|
"_id","EntName","RegOrgName","RegNo","EntType",
|
|
"_id","EntName","RegOrgName","RegNo","EntType",
|
|
"LeRep","EstDate","OpLocDistrictName","OpStateName",
|
|
"LeRep","EstDate","OpLocDistrictName","OpStateName",
|
|
- "s_servicenames","s_action","OpLocDistrict","s_submitid"
|
|
|
|
|
|
+ "s_servicenames","s_action","OpLocDistrict","s_submitid","excDirect"
|
|
],
|
|
],
|
|
"from": 0,"size": 10,
|
|
"from": 0,"size": 10,
|
|
"sort": [{"OpSint": "desc","RegCap": "desc"}]
|
|
"sort": [{"OpSint": "desc","RegCap": "desc"}]
|