Merge branch 'dev/v1.1.26_fuwencai' of BaseService/jyMicroservices into feature/v1.1.26

jyBXBuyer/rpc/model/buyerListBYEs.go

@@ -84,7 +84,7 @@ func BuyerListQuery(in *bxbuyer.BuyerListReq) (qstr string, CountQstr string) {
 	}
 	boolsNum := 0
 	qstr = fmt.Sprintf(query, fmt.Sprintf(`"from":%d,"size": %d,`, (in.PageNum-1)*in.PageSize, in.PageSize), strings.Join(musts, ","), strings.Join(bools, ","), boolsNum, sort)
-	CountQstr = fmt.Sprintf(query, "", strings.Join(musts, ","), strings.Join(bools, ","), boolsNum, sort)
+	CountQstr = fmt.Sprintf(query, "", strings.Join(musts, ","), strings.Join(bools, ","), boolsNum, "")
 	return
 }
 
@@ -743,7 +743,16 @@ func CheckEmpty(in *bxbuyer.BuyerListReq) bool {
 
 // 获取采购单位查询query
 func BuyerListRedisCacheQuery(pageNum, pageSize int64) (qstr string) {
-	qstr = `{"size":0,"query":{"bool":{"must_not":[{"term":{"buyer":""}}]}},"aggs":{"buyerBuckets":{"terms":{"field":"buyer","order":[{"_count":"desc"}],"size":200},"aggs":{"bidAmountCount":{"sum":{"field":"bidamount"}}}}}}`
-
-	return qstr
+	qstr = `{"size":0,"query":{"bool":{        "must": [
+            {
+                "range": {
+                    "jgtime": {
+                        "gte": %d,
+                        "lt": %d
+                    }
+                }
+            }
+        ],"must_not":[{"term":{"buyer":""}}]}},"aggs":{"buyerBuckets":{"terms":{"field":"buyer","order":[{"_count":"desc"}],"size":200},"aggs":{"bidAmountCount":{"sum":{"field":"bidamount"}}}}}}`
+	start, end := getTimeRange()
+	return fmt.Sprintf(qstr, start.Unix(), end.Unix())
 }