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/config.json

@@ -6,7 +6,7 @@
     "alltocoll": "marked",
     "bidding":{
         "addr":"192.168.3.207:27092",
-        "db": "qfw_data",
+        "db": "mxs",
         "coll1": "bidding",
         "coll2": "bidding_back",
         "size": 10,

src/front/group.go

@@ -74,20 +74,20 @@ func (f *Front) GroupTaskListByAdmin() {
 		status := f.GetString("s_status")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
-		starttime := f.GetString("starttime")
-		endtime := f.GetString("endtime")
+		starttime, _ := f.GetInt("starttime")
+		endtime, _ := f.GetInt("endtime")
 		query := map[string]interface{}{
 			"s_stype": "group", //检索用户组任务
 		}
-		timeQ := make(map[string]interface{})
-		if starttime != "" {
-			timeQ["$gte"], _ = strconv.Atoi(starttime)
-		}
-		if endtime != "" {
-			timeQ["$lte"], _ = strconv.Atoi(endtime)
+		if starttime > 0 {
+			query["i_starttime"] = map[string]interface{}{
+				"$gte": starttime,
+			}
 		}
-		if len(timeQ) > 0 {
-			query["i_createtime"] = timeQ
+		if endtime > 0 {
+			query["i_completetime"] = map[string]interface{}{
+				"$lte": endtime,
+			}
 		}
 		if status != "-1" { //任务状态
 			query["s_status"] = status

src/front/mark.go

@@ -111,10 +111,10 @@ func (f *Front) JyMarkList() {
 		} else if !fieldScreen && notag {
 			query["i_ckdata"] = 0
 		}
-		qu.Debug("query:", query, sourceInfo)
+		count := util.Mgo.Count(sourceInfo, query)
+		qu.Debug("query:", query, sourceInfo, count)
 		fields := map[string]interface{}{"v_baseinfo.title": 1, "b_istag": 1, "i_ckdata": 1}
 		list, _ := util.Mgo.Find(sourceInfo, query, map[string]interface{}{"_id": 1}, fields, false, start, limit)
-		count := util.Mgo.Count(sourceInfo, query)
 		//checkedNum, allNum := GetCheckedAndAllDataInfo(query, coll) //已标和总数信息
 		f.ServeJson(map[string]interface{}{"draw": draw, "data": *list, "recordsFiltered": count, "recordsTotal": count})
 	} else {

src/front/project.go

@@ -180,12 +180,12 @@ func (f *Front) ProjectSave() {
 			msg = "保存项目成功"
 		}
 	}
-	qu.Debug("Create Project：", success, "importnum：", importDataNum, "successnum：", successNum, "failnum：", int64(importDataNum)-successNum)
 	//qu.Debug("Msg：", msg)
 	//返回信息
 	if stype == "edit" {
 		f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 	} else {
+		qu.Debug("Create Project：", success, "importnum：", importDataNum, "successnum：", successNum, "failnum：", int64(importDataNum)-successNum)
 		f.ServeJson(map[string]interface{}{"success": success, "msg": msg, "importnum": importDataNum, "successnum": successNum, "failnum": int64(importDataNum) - successNum})
 	}
 }
@@ -442,7 +442,7 @@ func (f *Front) ProjectGroupTaskSave() {
 			success = util.Mgo.SaveBulk(util.TASKCOLLNAME, taskArr...)
 			if success {
 				msg = "任务分发成功"
-				UpdateSourceInfoByGroup(sourceinfo, stype, groupIdTask) //用户组分发任务成功后，给数据源打上用户组标识，同时生成任务临时表
+				UpdateSourceInfoByGroup(sourceinfo, stype, groupIdTask) //用户组分发任务成功后，给数据源打上用户组标识
 			} else {
 				msg = "任务分发失败"
 			}
@@ -976,7 +976,7 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 	for i, data := range idInfoArr {
 		wg.Add(1)
 		ch <- true
-		func(index int, tmpData util.Data) {
+		go func(index int, tmpData util.Data) {
 			defer func() {
 				wg.Done()
 				<-ch

src/util/config.go

@@ -63,6 +63,7 @@ var SourceInfoIndexArr = []mongo.IndexModel{
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "b_istag": 1}},
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "b_istagging": 1}},
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "i_ckdata": 1}},
+	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "i_ckdata": 1, "b_istagging": 1}},
 }
 
 const JYHREFPRE = "https://www.jianyu360.cn/article/content/"