Merge branch 'dev_v1.5.23_wh' of jianyu/datatools into feature/v1.5.23

clueSync/job.go

@@ -472,7 +472,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 							"BCPCID":       BCPCID,
 							"operator_id":  -1})
 						//标签处理
-						LabelHandel(label, 2, uId, level, trailstatusCode, labelChangeTime)
+						LabelHandel(label, 2, uId, level, trailstatusCode, gconv.String(clueUpdateData["trailstatus"]), labelChangeTime)
 					}
 					clueUpdateData["company_nature"] = isGroup
 					clueUpdateData["company_verification"] = isCommerce
@@ -1273,13 +1273,13 @@ func WorkUpdateClue(data map[string]interface{}, saleData []map[string]interface
 			})
 			//标签处理
 			if old_position_id != positionId && newPositionId > 0 {
-				LabelHandel(label, 1, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 1, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			} else {
-				LabelHandel(label, 2, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 2, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			}
 		} else {
 			if old_position_id != positionId && newPositionId > 0 {
-				LabelHandel(label, 1, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 1, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			}
 		}
 		return ok && updateId1 > -1 && updateId2 > -1 && updateId3 > -1 && updateId4 > -1 && updateId5 > -1 && updateId6 > -1 && updateId7 > -1 && updateId8 > -1 && updateId9 > -1 && updateId10 > -1 && updateId11 > -1 && updateId12 > -1 && updateId13 > -1 && updateId14
@@ -1906,13 +1906,13 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 				"operator_id":  -1,
 			})
 			if old_position_id != newPositionId && newPositionId > 0 {
-				LabelHandel(label, 1, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 1, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			} else {
-				LabelHandel(label, 2, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 2, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			}
 		} else {
 			if old_position_id != newPositionId && newPositionId > 0 {
-				LabelHandel(label, 1, uId, level, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
+				LabelHandel(label, 1, uId, level, trailstatus, gconv.String(clueUpdateData["trailstatus"]), oldLabelChangeTime)
 			}
 		}
 		return ok && updateId1 > -1 && updateId2 > -1 && updateId3 > -1 && updateId4 > -1 && updateId5 > -1 && updateId6 > -1 && updateId7 > -1 && updateId8 > -1 && updateId9 > -1 && updateId10 > -1 && updateId11 > -1 && updateId12 > -1 && updateId13 > -1 && updateId14
@@ -2111,7 +2111,7 @@ func clueInfoUpdate(data ClueMapEntity) bool {
 				"BCPCID":       BCPCID,
 				"operator_id":  -1,
 			})
-			LabelHandel(data.Label, 1, data.UId, data.Level, data.Trailstatus, data.LabelChangeTime)
+			LabelHandel(data.Label, 1, data.UId, data.Level, data.Trailstatus, data.Trailstatus, data.LabelChangeTime)
 		}
 		return ok && updateId1 > -1 && updateId2 > -1 && updateId3 > -1 && updateId4 > -1 && updateId5 > -1 && updateId6 > -1 && updateId7 > -1 && updateId8 > -1 && updateId9 > -1 && updateId10 > -1 && updateId11 > -1 && updateId12 > -1 && updateId13 > -1
 	}) {
@@ -2135,10 +2135,10 @@ func clueInfoUpdate(data ClueMapEntity) bool {
 }
 
 // 线索标签修改 label  labelChangeTime
-func LabelHandel(oldlabelType, labelType int64, uId, level, trailstatusCode, labelChangeTime string) {
+func LabelHandel(oldlabelType, labelType int64, uId, level, oldTrailstatusCode, trailstatusCode, labelChangeTime string) {
 	log.Println("线索标签修改:", oldlabelType, labelType, uId, level, trailstatusCode, labelChangeTime)
 	//先查询以前什么类型
-	if trailstatusCode != "01" {
+	if trailstatusCode != "01" && oldTrailstatusCode != "01" {
 		return
 	}
 	updateLabelType := int64(0)