获取审核字段

src/jy/admin/resulttrack.go

@@ -94,7 +94,7 @@ func ClearColl(c *gin.Context) {
 func GetVersionInfo(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
 	v, _ := Mgo.FindOne("version", `{"version":"`+version+`"}`)
-	if len(*v) > 0 {
+	if v != nil && len(*v) > 0 {
 		vid := (*v)["_id"].(bson.ObjectId).Hex()
 		query := map[string]interface{}{
 			"vid":    vid,

src/jy/extract/extract.go

@@ -48,6 +48,7 @@ func StartExtractTestTask(taskId, startId, num, resultcoll, trackcoll string) bo
 		ext.InitDFA()
 	}
 	//质量审核
+	ext.InitAuditFields()
 	ext.InitAuditRule()
 	ext.InitAuditClass()
 	ext.InitAuditRecogField()
@@ -845,23 +846,6 @@ func AnalysisSaveResult(j *ju.Job, e *ExtractTask) {
 
 func (e *ExtractTask) QualityAudit(resulttmp map[string]interface{}) {
 	//获取审核字段
-	//log.Println("需要审核的字段-----", AuditFields)
-	if len(e.AuditFields) == 0 {
-		v, _ := db.Mgo.FindOne("version", `{"isuse":true,"delete":false}`) //查找当前使用版本
-		if len(*v) > 0 {                                                   //查找当前使用版本中属性配置需要审核的字段
-			vid := qu.BsonIdToSId((*v)["_id"])
-			query := map[string]interface{}{
-				"isaudit": true,
-				"delete":  false,
-				"vid":     vid,
-			}
-			data, _ := db.Mgo.Find("versioninfo", query, `{"_id":-1}`, `{"s_field":1}`, false, -1, -1)
-			for _, d := range *data {
-				field := qu.ObjToString(d["s_field"])
-				e.AuditFields = append(e.AuditFields, field)
-			}
-		}
-	}
 	for _, field := range e.AuditFields {
 		//1.分包
 		if resulttmp["package"] != nil {

src/jy/extract/extractInit.go

@@ -748,3 +748,23 @@ func (e *ExtractTask) InitAuditRule() {
 		e.CidRuleMap[classid] = ruleList
 	}
 }
+
+//
+func (e *ExtractTask) InitAuditFields() {
+	if len(e.AuditFields) == 0 {
+		v, _ := db.Mgo.FindOne("version", `{"isuse":true,"delete":false}`) //查找当前使用版本
+		if v != nil && len(*v) > 0 {                                       //查找当前使用版本中属性配置需要审核的字段
+			vid := qu.BsonIdToSId((*v)["_id"])
+			query := map[string]interface{}{
+				"isaudit": true,
+				"delete":  false,
+				"vid":     vid,
+			}
+			data, _ := db.Mgo.Find("versioninfo", query, `{"_id":-1}`, `{"s_field":1}`, false, -1, -1)
+			for _, d := range *data {
+				field := qu.ObjToString(d["s_field"])
+				e.AuditFields = append(e.AuditFields, field)
+			}
+		}
+	}
+}