no message

src/front/front.go

@@ -79,7 +79,7 @@ type Front struct {
 	userTaskList     xweb.Mapper `xweb:"/front/user/task/list"`     //用户任务列表
 	userTaskRetrieve xweb.Mapper `xweb:"/front/user/task/retrieve"` //用户任务收回
 	userTaskDeliver  xweb.Mapper `xweb:"/front/user/task/deliver"`  //用户任务交付
-	userTaskClose    xweb.Mapper `xweb:"/front/user/task/close"`    //用户任务关闭
+	userTaskClose    xweb.Mapper `xweb:"/front/user/task/close"`    //用户任务关闭改打回
 
 	//group task
 	groupTaskListByAdmin xweb.Mapper `xweb:"/front/group/admin/task/list"` //用户组任务列表(系统管理员权限)

src/front/project.go

@@ -1181,7 +1181,7 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 					atomic.AddInt64(successNum, 1) //保存成功计数
 				} else {
 					lock.Lock()
-					*success = false
+					//*success = false
 					if importType == "excel" {
 						msgArr = append(msgArr, "第"+fmt.Sprint(index+2)+"行未导入id："+id)
 						//*msg += "第" + fmt.Sprint(num+2) + "行未保存成功数据_id：" + id + ";\n"
@@ -1195,7 +1195,7 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 				lock.Lock()
 				*success = false
 				if importType == "excel" {
-					msgArr = append(msgArr, "第"+fmt.Sprint(index+2)+"行未查询id："+id)
+					msgArr = append(msgArr, "第"+fmt.Sprint(index+2)+"行，未查询到id："+id)
 					//*msg += "第" + fmt.Sprint(num+2) + "行未查询到数据：" + id + ";\n"
 				} else {
 					msgArr = append(msgArr, "未查询id:"+id)

src/front/remark.go

@@ -682,6 +682,7 @@ func (f *Front) CheckData() {
 		if search != "" {
 			query["$or"] = []interface{}{
 				map[string]interface{}{"v_baseinfo.title": map[string]interface{}{"$regex": search}},
+				map[string]interface{}{"s_login": map[string]interface{}{"$regex": search}},
 			}
 		}
 		fields := map[string]interface{}{"v_baseinfo.title": 1, "b_check": 1, "i_ckdata": 1, "s_login": 1, "b_istag": 1}

src/front/user.go

@@ -750,7 +750,7 @@ func (f *Front) UserTaskList() {
 		}
 		if s_role == "4" {
 			query["s_personid"] = s_personid
-		} else if s_role == "2" {
+		} else if s_role == "2" || s_role == "1" {
 			query["s_groupid"] = gid
 		}
 		if status != "-1" { //任务状态
@@ -835,24 +835,41 @@ func (f *Front) UserTaskDeliver() {
 	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 }
 
-// UserTaskClose 用户任务关闭
+// UserTaskClose 用户任务打回
 func (f *Front) UserTaskClose() {
 	defer qu.Catch()
 	user := f.GetSession("user").(map[string]interface{})
 	username := qu.ObjToString(user["s_login"])
-	userTaskId := f.GetString("taskid") //用户任务id
-	qu.Debug("User Task Id：", userTaskId)
+	taskid := f.GetString("taskid") //用户任务id
+	qu.Debug("User Task Id：", taskid)
 	sourceInfo := f.GetString("s_sourceinfo") //数据源表
-	//status := f.GetString("s_status")
-	task, _ := Mgo.FindById(TASKCOLLNAME, userTaskId, map[string]interface{}{"s_status": 1})
-	if len(*task) <= 0 {
-		f.ServeJson(map[string]interface{}{"success": false, "msg": "查询任务失败"})
+	currenttime := time.Now().Unix()
+	//更新数据源
+	success := Mgo.Update(sourceInfo, map[string]interface{}{"s_usertaskid": taskid}, map[string]interface{}{
+		"$set": map[string]interface{}{
+			"b_istag":      false,
+			"i_ckdata":     0,
+			"i_updatetime": currenttime,
+		},
+	}, false, true)
+	// 修改任务
+	if success {
+		Mgo.UpdateById(TASKCOLLNAME, taskid, map[string]interface{}{
+			"$set": map[string]interface{}{
+				"s_status":       "未开始",
+				"s_updateperson": username,
+				"i_updatetime":   currenttime,
+				"s_progress":     "0%",
+			},
+			"$unset": map[string]interface{}{
+				"i_completetime": "",
+			},
+		})
+	} else {
+		f.ServeJson(map[string]interface{}{"success": false, "msg": "操作失败"})
 		return
 	}
-	status := qu.ObjToString((*task)["s_status"])
-	userTaskIdStatus := map[string]string{userTaskId: status}
-	msg, count, success := RetrieveCloseTaskByUser(sourceInfo, username, userTaskIdStatus)
-	f.ServeJson(map[string]interface{}{"success": success, "count": count, "msg": msg})
+	f.ServeJson(map[string]interface{}{"success": success})
 }
 
 // UpdateSourceInfoByUser 用户分发任务成功后更新数据源表

src/web/templates/login.html

@@ -105,7 +105,6 @@
                 data:{"username": username,"pwd": pwd,"imgCode": $("#verifyImgCode").val()},
                 success:function(r){
                     if(r.checked){
-                      alert(r.role)
                       if (r.role === "4") {
                         window.location.href="/front/user/task/list"
                       }else if (r.role === "3") {

src/web/templates/project/check_data_list.html

@@ -124,12 +124,12 @@
             },
             "columns": [
                 {"data": null, width: "2%"},
-                {"data": "b_istag", width: "4%", render: function (val) {
+                {"data": "b_check", width: "5%", render: function (val) {
                         let tmp;
                         if (val) {
-                            tmp = '<span style="display: inline-block;font-size:14px;">已标注</span>'
+                            tmp = '<span style="display: inline-block;font-size:14px;">已质检</span>'
                         } else {
-                            tmp = '<span style="display: inline-block;font-size:14px;">未标注</span>'
+                            tmp = '<span style="display: inline-block;font-size:14px;">未质检</span>'
                         }
                         return tmp
                     }},

src/web/templates/project/project_clear.html

@@ -418,10 +418,9 @@
     }
 
     // 打回
-    function repulseTask(id, sourceinfo,status) {
+    function repulseTask(id, sourceinfo, status) {
         if (status === "已完成") {
             showConfirm("确认要打回当前任务吗？", function () {
-
                 $.ajax({
                     url: "/front/project/task/repulse",
                     type: 'POST',
@@ -438,7 +437,6 @@
         }else {
             showTip("操作不允许")
         }
-
     }
 
     function closeTask(id, sourceinfo,status) {

src/web/templates/project/task_detail.html

@@ -221,7 +221,7 @@
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" href="/front/user/check/data?pid='+row.s_projectid+'&tid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">质检</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-primary" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\',\''+row.s_sourceinfo+'\')">关闭</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\',\''+row.s_sourceinfo+'\')">打回</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
@@ -447,8 +447,8 @@
         }
     }
     function closeTask(id, status, sourceinfo) {
-        if (status === "未开始") {
-            showConfirm("确认要关闭当前任务吗？", function () {
+        if (status === "已完成" || status === "进行中") {
+            showConfirm("确认要打回当前任务吗？", function () {
                 $.ajax({
                     url: "/front/user/task/close",
                     type: 'POST',

src/web/templates/project/task_list.html

@@ -137,6 +137,7 @@
                             '<a class="btn btn-sm btn-primary" href="/front/group/user/task/list?grouptaskid='+val+'&s_groupid='+row.s_groupid+'&s_sourceinfo='+row.s_sourceinfo+'&stype=jy">查看</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\'' + val + '\',\''+row.s_sourceinfo+'\',\'' + row.s_status + '\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="checkMethod(\'' + row.s_projectid + '\',\'' + val + '\',\'' + row.s_sourceinfo + '\')">质检</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="repulseTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">打回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="closeTask(\'' + val + '\',\''+row.s_sourceinfo+'\',\'' + row.s_status + '\')">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
@@ -240,6 +241,28 @@
         }
     }
 
+    // 打回
+    function repulseTask(id, sourceinfo, status) {
+        if (status === "已完成") {
+            showConfirm("确认要打回当前任务吗？", function () {
+                $.ajax({
+                    url: "/front/project/task/repulse",
+                    type: 'POST',
+                    data: {"s_sourceinfo": sourceinfo, "taskid": id},
+                    success: function (r) {
+                        if (r.success) {
+                            location.reload()
+                        } else {
+                            showTip(r.msg);
+                        }
+                    }
+                })
+            })
+        }else {
+            showTip("操作不允许")
+        }
+    }
+
     function exportTask() {
 
         let search = $("[type=search]").val();