Merge branch 'dev/v1.1.20_fuwencai' of http://192.168.3.207:8080/BaseService/jyMicroservices into dev/v1.1.20_fuwencai

jyBXCore/rpc/model/es/project.go

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-//项目信息 项目id
+// 项目信息 项目id
 func GetProjectInfo(id string) map[string]interface{} {
 	projectInfos := elastic.GetById(IndexProjectSet, TypeProjectSet, id)
 	if projectInfos != nil && len(*projectInfos) > 0 {
@@ -16,7 +16,7 @@ func GetProjectInfo(id string) map[string]interface{} {
 	return nil
 }
 
-//招标信息 招标信息id
+// 招标信息 招标信息id
 func GetBiddingInfo(id string) map[string]interface{} {
 	biddingInfos := elastic.GetById(INDEX, TYPE, id)
 	if biddingInfos != nil && len(*biddingInfos) > 0 {
@@ -48,7 +48,9 @@ func GetValidProjectByInfoId(infoIds []string) *[]map[string]interface{} {
         ]
     }
 }
-] }}]}}}`
+] }}]}},
+"size": 500
+}`
 
 	projectResult := elastic.Get(IndexProjectSet, TypeProjectSet, query)
 	return projectResult

jyBXCore/rpc/model/mysql/participateBid.go

@@ -52,7 +52,7 @@ func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq)
 			b1                                             = true
 			b2, b3                                         bool
 			now                                            = time.Now()
-			content                                        = "%s划转给%s%s"
+			content                                        = "从%s名下划转给%s%s"
 			lastNotes                                      = ",保留原参标人"
 			fromEntUserNames, toEntUserNames, toEntUserIds []string
 			ids                                            []int
@@ -168,7 +168,7 @@ func CancelParticipateInfo(in *bxcore.ParticipateActionReq, roleId int64) error
 		var (
 			b1, b2 bool
 			now    = time.Now()
-			tip    = "终止参标（被）"
+			tip    = "终止参标"
 		)
 		//管理员终止：当前项目 其他参标人也被终止
 		query := map[string]interface{}{