xg

src/front/mark.go

@@ -83,18 +83,6 @@ func (f *Front) DataMark() {
 		}
 	}
 	//
-	allTagFields := map[string]interface{}{} //记录此此标注所有标注信息，用于日志记录
-	for k, _ := range tagSet {
-		allTagFields[k] = true
-	}
-	for k, v := range baseSet {
-		allTagFields[k] = v
-	}
-	for k, _ := range baseUnset {
-		allTagFields[k] = nil
-	}
-	qu.Debug("allTagFields===", allTagFields)
-	//
 	userTask, _ := util.Mgo.FindById(util.TASKCOLLNAME, userTaskId, map[string]interface{}{"s_personid": 1, "s_personname": 1, "s_projectname": 1, "s_sourceinfo": 1})
 	if userTask == nil || len(*userTask) == 0 {
 		f.ServeJson(map[string]interface{}{"success": success, "msg": "查询用户任务失败"})
@@ -106,9 +94,6 @@ func (f *Front) DataMark() {
 	baseInfo, _ := (*dataInfo)["v_baseinfo"].(map[string]interface{})
 	if tagInfo != nil && len(tagInfo) > 0 {
 		for field, tmpStatus := range tagSet { //比对本次标注信息和历史标注信息
-			if field == "purchasinglist_alltag" {
-				continue
-			}
 			status := qu.IntAll(tmpStatus)            //此次被标注字段的状态
 			markedStatus := qu.IntAll(tagInfo[field]) //历史标注状态
 			if status == 1 && markedStatus != 0 {     //此次标注结果为正确，且有历史标注记录，不做修改
@@ -122,8 +107,20 @@ func (f *Front) DataMark() {
 			//}
 		}
 	}
+	//
+	allTagFields := map[string]interface{}{} //记录此此标注所有标注信息，用于日志记录
+	for k, _ := range tagSet {
+		allTagFields[k] = true
+	}
+	for k, v := range baseSet {
+		allTagFields[k] = v
+	}
+	for k, _ := range baseUnset {
+		allTagFields[k] = nil
+	}
+	qu.Debug("allTagFields===", allTagFields)
 	qu.Debug("tagSet===", tagSet)
-	if len(tagSet) > 0 {
+	if len(tagSet) > 0 || baseInfo["purchasinglist_alltag"] != nil { //purchasinglist_alltag特殊处理
 		//1、更新数据源信息
 		setResult := map[string]interface{}{ //更新字段集
 			"i_updatetime": time.Now().Unix(),
@@ -513,10 +510,10 @@ func MarkOther(content []interface{}, tagSet, baseSet, baseUnset map[string]inte
 func SaveLog(s_infoid, s_usertaskid, username, userid, s_stype string, baseInfo, allTagFields, userTask map[string]interface{}) (success bool) {
 	defer qu.Debug()
 	v_before := map[string]interface{}{}
-	for f, v := range allTagFields {
-		if _, ok := v.(bool); ok { //表示此次标注status=1的字段
-			allTagFields[f] = baseInfo[f]
-		}
+	for f, _ := range allTagFields {
+		//if _, ok := v.(bool); ok { //表示此次标注status=1的字段
+		//	allTagFields[f] = baseInfo[f]
+		//}
 		v_before[f] = baseInfo[f]
 	}
 	save := map[string]interface{}{

src/web/templates/project/remark_detail.html

@@ -1378,7 +1378,7 @@
                     $.ajax({
                         url: "/front/data/mark",
                         method: "post",
-                        data: {"data": d, "s_infoid": _id, "s_usertaskid": tid},
+                        data: {"data": d, "s_infoid": _id, "s_usertaskid": {{ .T.tid}}},
                         success: function (res) {
                             if (res) {
                                 _this.$message({