xg

telemarketingEtl/entity/Voiced.go

@@ -202,13 +202,13 @@ func getMissedCalls() {
 		total    int64
 	)
 	if firstLoad1 {
-		sql = "SELECT createTime, CallNo, CalledNo FROM voice_record WHERE State != 'dealing' ORDER BY createTime ASC"
-		countSql = "SELECT COUNT(id) FROM voice_record WHERE State != 'dealing'"
+		sql = "SELECT createTime, CallNo, CalledNo FROM voice_record ORDER BY createTime ASC"
+		countSql = "SELECT COUNT(id) FROM voice_record"
 		firstLoad1 = false
 	} else {
 		aTime := time.Now().Add(-1 * time.Hour)
-		sql = "SELECT createTime, CallNo, CalledNo FROM voice_record WHERE State != 'dealing' AND createTime >= " + aTime.Format(time.DateTime) + " ORDER BY createTime ASC"
-		countSql = "SELECT COUNT(id) FROM voice_record WHERE State != 'dealing' AND createTime >= " + aTime.Format(time.DateTime)
+		sql = "SELECT createTime, CallNo, CalledNo FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime) + " ORDER BY createTime ASC"
+		countSql = "SELECT COUNT(id) FROM voice_record WHERE createTime >= " + aTime.Format(time.DateTime)
 	}
 	total = config.VoicedRecordDb.CountBySql(countSql)
 	log.Println("MissedCalls getMissedCalls---", total)
@@ -245,22 +245,32 @@ func getMissedCalls() {
 		}
 		phone := common.ObjToString(ret["CalledNo"])
 		vdate := strings.Split(common.ObjToString(ret["createTime"]), " ")[0]
+		ctype := common.ObjToString(ret["CallType"])
 		uid := userPhone[phone]
-		if missedPhone[uid] != nil {
-			v := missedPhone[uid]
-			if VerifyDate(v.vDate, vdate) <= 1 {
-				v.vDate = vdate
-				v.missed += 1
+		if ctype != "dealing" {
+			if missedPhone[uid] != nil {
+				v := missedPhone[uid]
+				if VerifyDate(v.vDate, vdate) <= 1 {
+					v.vDate = vdate
+					v.missed += 1
+				} else {
+					v.missed = 1
+					v.vDate = vdate
+				}
 			} else {
-				v.missed = 1
-				v.vDate = vdate
+				missedPhone[uid] = &Voiced{
+					vDate:  vdate,
+					missed: 1,
+				}
 			}
 		} else {
-			missedPhone[uid] = &Voiced{
-				vDate:  vdate,
-				missed: 1,
+			if missedPhone != nil {
+				v := missedPhone[uid]
+				v.vDate = vdate
+				v.missed = 0
 			}
 		}
+
 	}
 	_ = rows.Close()
 }