浏览代码

免费用户可以筛选采购单位画像

wangkaiyue 3 年之前
父节点
当前提交
6c500c95c9

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portraitBuyerSearch.go

@@ -73,7 +73,7 @@ func GetBuyerPortraitData(screen *PortraitScreen) (map[string]interface{}, error
 func BuyerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(false)
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)
 

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -106,7 +106,7 @@ func GetProjectContactsMsg(buyerName, entId string) (list []map[string]interface
 func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(true)
 
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)

+ 5 - 4
src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -100,11 +100,12 @@ func (ps *PortraitScreen) PareMatchType(isBidding ...bool) (items []string) {
 }
 
 //PareTimeSelect 格式筛选时间,默认2年
-func (ps *PortraitScreen) PareTimeSelect() (st, et time.Time) {
+func (ps *PortraitScreen) PareTimeSelect(checkPower bool) (st, et time.Time) {
 	now := time.Now()
 	sYear := now.Year() - 4
 	eYear := now.Year()
-	if yearArr := strings.Split(ps.TimeRange, "_"); ps.HasPower && len(yearArr) == 2 {
+	//需要校验权限时 无权限默认查询两年
+	if yearArr := strings.Split(ps.TimeRange, "_"); (!checkPower || ps.HasPower) && len(yearArr) == 2 {
 		if tYear := qutil.IntAll(yearArr[0]); tYear > sYear { //选择开始时间不得早于4年
 			sYear = tYear
 		}
@@ -191,7 +192,7 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 		}
 	}
 	//按照当前年份,往前推4年,共5个年份可选
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(true)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"publishtime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
 
 	//地区多选,选项:全部(初始值)、项目地区(省、直辖市)
@@ -271,7 +272,7 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"term":{"buyer":"%s"}}`, pwp.Screen.Ent))
 
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(false)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
 
 	//文本输入框,字数限制50个字,超过上限不再允许输入内容