Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

fullproject/src_dev5/init.go

@@ -287,8 +287,9 @@ type ProjectInfo struct {
 	Bidamount float64 `json:"bidamount"` //中标金额
 	Budget    float64 `json:"budget"`    //预算
 	//Winnerorder []string `json:"winnerorder"` //中标候选人
-	score  int
-	comStr string
+	score         int
+	comStr        string
+	resVal, pjVal int
 }
 
 //二分字符串查找

fullproject/src_dev5/project.go

@@ -113,7 +113,6 @@ func (p *ProjectTask) startProjectMerge(info *Info, tmp map[string]interface{})
 	comRes1 := []*ProjectInfo{} //优先级最高的对比结果数组
 	comRes2 := []*ProjectInfo{} //优化级其次
 	comRes3 := []*ProjectInfo{}
-	resVal, pjVal := 0, 0
 	for _, v := range IDArr {
 		comStr := ""
 		compareProject := v.P
@@ -127,17 +126,17 @@ func (p *ProjectTask) startProjectMerge(info *Info, tmp map[string]interface{})
 			info.PTCBH = 0
 			compareStr, score := comparePNC(info, compareProject)
 
-			resVal, pjVal = Select(compareStr, info, compareProject)
+			resVal, pjVal := Select(compareStr, info, compareProject)
 			//---------------------------------------
 			//log.Println(resVal, pjVal, compareProject)
 			if resVal > 0 {
-
 				compareBuyer, compareCity, compareTime, compareAgency, compareBudget, compareBidmount, score2 := p.compareBCTABB(info, compareProject, diffTime, score)
 
 				//项目名称、项目编号、标题项目编号、采购单位、省、市、发布时间、代理机构
-
 				comStr = compareStr + compareBuyer + compareCity + compareTime + compareAgency + compareBudget + compareBidmount
 				compareProject.comStr = comStr
+				compareProject.pjVal = pjVal
+				compareProject.resVal = resVal
 				//log.Println(compareProject.comStr)
 				eqV := 0
 				switch resVal {
@@ -263,7 +262,7 @@ func (p *ProjectTask) startProjectMerge(info *Info, tmp map[string]interface{})
 					}
 				}
 			}
-			p.UpdateProject(tmp, info, resN[0], kv+1, resN[0].comStr, resVal, pjVal)
+			p.UpdateProject(tmp, info, resN[0], kv+1, resN[0].comStr)
 			break
 		}
 	}
@@ -538,7 +537,7 @@ func (p *ProjectTask) NewCachePinfo(id bson.ObjectId, thisinfo *Info) ProjectInf
 }
 
 //更新项目
-func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info, pInfo *ProjectInfo, weight int, comStr string, resVal, pjVal int) {
+func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info, pInfo *ProjectInfo, weight int, comStr string) {
 	if p.currentType != "ql" {
 		if BinarySearch(pInfo.Ids, thisinfo.Id) > -1 {
 			log.Println("repeat", thisinfo.Id)
@@ -693,8 +692,8 @@ func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info,
 	//保留原数据吧
 	push := p.PushListInfo(tmp)
 	push["compareStr"] = comStr
-	push["resVal"] = resVal
-	push["pjVal"] = pjVal
+	push["resVal"] = pInfo.pjVal
+	push["pjVal"] = pInfo.pjVal
 	update["$push"] = map[string]interface{}{
 		"list": push,
 		"ids":  thisinfo.Id,