xuzhiheng 1 yıl önce
ebeveyn
işleme
43ae2a496d
1 değiştirilmiş dosya ile 15 ekleme ve 5 silme
  1. 15 5
      service/company.go

+ 15 - 5
service/company.go

@@ -58,7 +58,7 @@ func DistributeClueShow(this *biservice.DistributeClueShowReq) *biservice.Distri
 			m.MinCount = 0
 		} else {
 			m.CompanyCount = c.DistributedCount
-			m.CompanyCounts = c.DistributedCount
+			// m.CompanyCounts = c.DistributedCount
 		}
 		rdata = append(rdata, m)
 		pArr = append(pArr, strconv.FormatInt(c.PositionId, 10))
@@ -76,9 +76,14 @@ func DistributeClueShow(this *biservice.DistributeClueShowReq) *biservice.Distri
 					if this.DataType == 1 {
 						rdata[k].CompanyCount++
 						rdata[k].MinCount++
+						rdata[k].CompanyCounts++
+						rdata[k].ClueCount += int64(count)
+					} else {
+						if rdata[k].CompanyCounts < rdata[k].CompanyCount {
+							rdata[k].CompanyCounts++
+							rdata[k].ClueCount += int64(count)
+						}
 					}
-					rdata[k].CompanyCounts++
-					rdata[k].ClueCount += int64(count)
 				}
 			}
 		}
@@ -159,9 +164,14 @@ func DistributeClueShow(this *biservice.DistributeClueShowReq) *biservice.Distri
 				}
 				if this.DataType == 1 {
 					rdata[minIndex].CompanyCount++
+					rdata[minIndex].CompanyCounts++
+					rdata[minIndex].ClueCount += int64(count)
+				} else {
+					if rdata[minIndex].CompanyCounts < rdata[minIndex].CompanyCount {
+						rdata[minIndex].CompanyCounts++
+						rdata[minIndex].ClueCount += int64(count)
+					}
 				}
-				rdata[minIndex].CompanyCounts++
-				rdata[minIndex].ClueCount += int64(count)
 				if this.DataType == 3 {
 					//分线索
 					iddata := JyBiTidb.SelectBySql(`SELECT id FROM dwd_f_crm_clue_info WHERE cluename = "` + cluename + `" and id in (` + strings.Join(clueArrs, ",") + `)`)