Merge branch 'master' into feature/v1.1.55

jyBXCore/entity/entity.go

@@ -0,0 +1,7 @@
+package entity
+
+import "regexp"
+
+var (
+	RegWinner = regexp.MustCompile(".+[司院厂所心处普学]$")
+)

jyBXCore/rpc/etc/bxcore.yaml

@@ -80,3 +80,6 @@ Stages:
     - "签合同##"
     - "已结束"
     - "终止参标"
+SearchWinner:
+  Switch: true
+  RegWinner: ".+[司院厂所心处普行]$"

jyBXCore/rpc/init/init.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"regexp"
 	"time"
 
 	"app.yhyue.com/moapp/jypkg/middleground"
@@ -87,4 +88,8 @@ func init() {
 		RegUserCenter(C.Middleground.UserCenterKey).
 		RegPowerCheckCenter(C.Middleground.PowerCheckCenterKey).
 		RegResourceCenter(C.Middleground.ResourceCenterKey)
+	//正则 winner
+	if C.SearchWinner.RegWinner != "" {
+		entity.RegWinner = regexp.MustCompile(C.SearchWinner.RegWinner)
+	}
 }

jyBXCore/rpc/internal/config/config.go

@@ -63,7 +63,11 @@ type Config struct {
 		ExecutionNum int
 		Wait         int
 	}
-	Stages []string
+	Stages       []string
+	SearchWinner struct {
+		Switch    bool
+		RegWinner string
+	}
 }
 type Db struct {
 	Mysql     entity.Mysql      `json:"mysql"`

jyBXCore/rpc/util/search.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/entity"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/config"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/type/bxcore"
@@ -255,6 +256,12 @@ func SearchListFormat(userid, subInformation, propertyForm, industry string, rep
 						winnerId = entIdList[wk]
 					}
 				}
+				if IC.C.SearchWinner.Switch && winnerId == "" {
+					continue
+				}
+				if entity.RegWinner.MatchString(wv) {
+					continue
+				}
 				searchList.WinnerInfo = append(searchList.WinnerInfo, &bxcore.WinnerInfo{
 					Winner:       wv,                                                                                                     //中标企业 需要单独处理
 					WinnerTel:    MC.ObjToString(v["winnertel"]),                                                                         //中标企业联系电话