Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

* 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation:
  xg

src/front/project.go

@@ -1127,10 +1127,10 @@ func UpdateMarkColl(bidData, markData, tagInfoMap, baseInfoMap *map[string]inter
 	defer qu.Catch()
 	ckdata := qu.IntAll((*markData)["i_ckdata"])
 	v_taginfo := (*markData)["v_taginfo"].(map[string]interface{})   //标注信息
-	v_datainfo := (*markData)["v_datainfo"].(map[string]interface{}) //基本信息
+	v_baseinfo := (*markData)["v_baseinfo"].(map[string]interface{}) //基本信息
 	for fk, _ := range v_taginfo {
-		if v_datainfo[fk] != nil {
-			(*bidData)[fk] = v_datainfo[fk] //字段更新
+		if v_baseinfo[fk] != nil {
+			(*bidData)[fk] = v_baseinfo[fk] //字段更新
 		}
 	}
 	(*tagInfoMap) = v_taginfo //marked中已有的标注信息保存到新数据上

src/front/quality.go

@@ -103,7 +103,6 @@ func calculateFieldScore(tmp map[string]interface{}, field_tag []string) map[str
 		}
 	}
 	b_istagging := !isUse
-
 	ckdata := 0
 	if isUse { //达标数据ck_data默认未2，未达标为0
 		ckdata = 2
@@ -118,9 +117,6 @@ func calculateFieldScore(tmp map[string]interface{}, field_tag []string) map[str
 			"b_istagging":   b_istagging,
 			"b_isprchasing": b_isprchasing,
 			"i_ckdata":      ckdata,
-			"b_istag":       !b_istagging,
-			"b_isgivegroup": !b_istagging,
-			"b_isgiveuser":  !b_istagging,
 		},
 	}
 }