feat:xiugai

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -2,28 +2,25 @@
 package analysis
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	. "app.yhyue.com/moapp/jybase/date"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/modules/bigmember/src/config"
 	"jy/src/jfw/modules/bigmember/src/db"
 	"jy/src/jfw/modules/bigmember/src/util"
-	"sort"
-	"strconv"
-
 	"log"
+	"sort"
+	"strings"
+	"time"
 
+	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
 	dfa "app.yhyue.com/moapp/jybase/dfa"
+	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-
-	"strings"
-	"time"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 const (
@@ -861,7 +858,7 @@ func getSqlObjFromId(o_member_jy map[string]interface{}, area string) *util.View
 		Subtype:    qutil.ObjArrToStringArr(a_infotype),
 		Area:       areaArr,
 		City:       cityArr,
-		SelectType: strconv.Itoa(qutil.IntAll(o_member_jy["i_matchway"])),
+		SelectType: gconv.SliceStr(o_member_jy["i_matchmode"]),
 		District:   districtArr,
 	}
 }

src/jfw/modules/bigmember/src/util/view.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"jy/src/jfw/modules/bigmember/src/config"
 	"log"
-	"strconv"
 	"strings"
 	"time"
 
@@ -39,7 +38,7 @@ type ViewCondition struct {
 	District   []string      //城市-区县
 	Buyerclass []string      //采购行业
 	Keyword    []ViewKeyWord //关键词
-	SelectType string        //筛选（正文 or 标题）
+	SelectType []string      //筛选（正文 or 标题）
 	Subtype    []string      //信息类型
 }
 
@@ -216,7 +215,7 @@ func GetMemberViewSql(userId string, scd *ViewCondition) string {
 		if stype == "" {
 			stype = "title"
 		}
-		multi_match = fmt.Sprintf(multi_match, "%s", "\""+scd.SelectType+"\"")
+		multi_match = fmt.Sprintf(multi_match, "%s", "\""+stype+"\"")
 		repeat := map[string]bool{}
 		for _, v := range scd.Keyword {
 			shoulds := []string{}