xg

src/front/project.go

@@ -250,7 +250,7 @@ func (f *Front) ProjectTaskList() {
 				giveNum := qu.IntAll(l["i_givenum"])
 				sourceinfo := qu.ObjToString(l["s_sourceinfo"])
 				tagNum := util.Mgo.Count(sourceinfo, map[string]interface{}{"b_isgivegroup": true, "s_groupid": groupId, "b_istag": true})
-				progress := fmt.Sprint(math.Ceil(float64(tagNum)/float64(giveNum))) + "%"
+				progress := fmt.Sprint(math.Ceil(float64(tagNum)/float64(giveNum))*100) + "%"
 				l["s_progress"] = progress
 				//同步数据库
 				util.Mgo.UpdateById(util.TASKCOLLNAME, l["_id"], map[string]interface{}{"$set": map[string]interface{}{"s_progress": progress}})

src/front/user.go

@@ -438,6 +438,7 @@ func (f *Front) UserTaskSave() {
 			}
 		}
 	}
+	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 }
 
 // UserTaskList 用户任务分发列表
@@ -473,7 +474,7 @@ func (f *Front) UserTaskList() {
 				giveNum := qu.IntAll(l["i_givenum"])
 				sourceinfo := qu.ObjToString(l["s_sourceinfo"])
 				tagNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_userid": personid, "b_istag": true})
-				progress := fmt.Sprint(math.Ceil(float64(tagNum)/float64(giveNum))) + "%"
+				progress := fmt.Sprint(math.Ceil(float64(tagNum)/float64(giveNum))*100) + "%"
 				l["s_progress"] = progress
 				//同步数据库
 				Mgo.UpdateById(TASKCOLLNAME, l["_id"], map[string]interface{}{"$set": map[string]interface{}{"s_progress": progress}})
@@ -486,8 +487,8 @@ func (f *Front) UserTaskList() {
 		//统计数据量
 		isGiveNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_isgiveuser": true})     //已分发量
 		isNotGiveNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_isgiveuser": false}) //待分发量
-		isTagNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_iscomplete": true})      //已标注数量
-		isNotTagNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_iscomplete": false})  //未标注数量
+		isTagNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_istag": true})           //已标注数量
+		isNotTagNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_istag": false})       //未标注数量
 		allNum := Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId})                              //数据总量
 		qu.Debug("数据总量：", allNum, "已分发量：", isGiveNum, "待分发量：", isNotGiveNum, "已标注量：", isTagNum, "未标注量：", isNotTagNum)
 		f.T["grouptaskid"] = groupTaskId
@@ -523,9 +524,9 @@ func UpdateSourceInfo(sourceinfo, groupTaskId string, userTaskIdInfo map[string]
 		ch := make(chan bool, 5)
 		wg := &sync.WaitGroup{}
 		lock := &sync.Mutex{}
-		query := map[string]interface{}{ //查找用户组任务id关联的临时数据
+		query := map[string]interface{}{
 			"s_grouptaskid": groupTaskId,
-			"b_istag":       false,
+			"b_isgiveuser":  false,
 		}
 		updateArr := [][]map[string]interface{}{}
 		qu.Debug("Query：", query)