|
@@ -505,8 +505,8 @@ func (f *Front) UserTaskList() {
|
|
|
map[string]interface{}{"s_projectname": map[string]interface{}{"$regex": search}},
|
|
|
}
|
|
|
}
|
|
|
- qu.Debug("Query:", query)
|
|
|
count := Mgo.Count(TASKCOLLNAME, query)
|
|
|
+ qu.Debug("Query:", query, count)
|
|
|
list, _ := Mgo.Find(TASKCOLLNAME, query, map[string]interface{}{"_id": -1}, nil, false, start, limit)
|
|
|
for _, l := range *list {
|
|
|
if status := qu.ObjToString(l["s_status"]); status == "进行中" { //更新任务进度
|
|
@@ -545,15 +545,15 @@ func (f *Front) UserTaskRetrieve() {
|
|
|
// UserTaskDeliver 标注完成交付任务
|
|
|
func (f *Front) UserTaskDeliver() {
|
|
|
defer qu.Catch()
|
|
|
- success := true
|
|
|
+ success := false
|
|
|
msg := ""
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
username := qu.ObjToString(user["s_login"])
|
|
|
- userTaskId := f.GetString("taskid") //用户任务id
|
|
|
- qu.Debug("User Task Id:", userTaskId)
|
|
|
+ userTaskId := f.GetString("taskid") //用户任务id
|
|
|
sourceInfo := f.GetString("s_sourceinfo") //数据源表
|
|
|
count := Mgo.Count(sourceInfo, map[string]interface{}{"s_usertaskid": userTaskId, "b_istag": false}) //查询是否含有未标注数据
|
|
|
- if count == 0 { //标注完成更新任务状态
|
|
|
+ qu.Debug("User Task Id:", userTaskId, count)
|
|
|
+ if count == 0 { //标注完成更新任务状态
|
|
|
set := map[string]interface{}{
|
|
|
"s_status": "已完成", //收回、关闭时默认任务状态已完成
|
|
|
"i_updatetime": time.Now().Unix(),
|