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

clueSync/autoTask.go

@@ -179,12 +179,16 @@ GROUP BY
 			trailstatus := gconv.String(v["trailstatus"])
 			//坐席信息查询
 			clueId := common.Int64All(v["id"])
+			createtime := gconv.String(v["comeintime"])
 			positionId := common.Int64All(v["position_id"])
 			seatNumber := common.ObjToString(v["seatNumber"])
 			if trailstatus == "01" {
 				//该线索最近一次分配给该电销人员后存在通话记录
 				uid := gconv.String(v["uid"])
-				if !PhoneState(uid, seatNumber) {
+				if createtime == "" {
+					continue
+				}
+				if !PhoneState(uid, seatNumber, createtime) {
 					continue
 				}
 			}
@@ -486,29 +490,25 @@ func IsBreak(currentTime time.Time) bool {
 		return isok
 	}
 }
-func PhoneState(uid, seatNumber string) bool {
+func PhoneState(uid, seatNumber, createtime string) bool {
 	phoneData := TiDb.SelectBySql("select DISTINCT phone from  dwd_f_userbase_contacts  where   baseinfo_id= ?", uid)
 	if phoneData == nil || len(*phoneData) == 0 {
 		//数据不对跳过去
 		return false
 	}
-	aa := false
 	for _, v1 := range *phoneData {
 		phone := gconv.String(v1["phone"])
-		callData := TiDb.FindOne("Call_Accounting.voice_record", map[string]interface{}{
-			"CalledNo": phone,
-		}, "Exten", "createTime")
+		callData := TiDb.SelectBySql("select DISTINCT Exten  from  Call_Accounting.voice_record  where  CalledNo=? and  createtime>=? ORDER BY createTime", phone, createtime)
 		if callData == nil || len(*callData) == 0 {
 			//手机号没有通话记录
 			continue
 		}
-		exten := gconv.String((*callData)["Exten"])
-		if seatNumber != exten {
-			continue
-		} else {
-			aa = true
-			break
+		for _, v2 := range *callData {
+			exten := gconv.String(v2["Exten"])
+			if seatNumber == exten {
+				return true
+			}
 		}
 	}
-	return aa
+	return false
 }