fix

services/cygx/activity_special.go

@@ -234,15 +234,20 @@ func GetSpecialSurplusByCompany(companyId int) (specialSurplus string, err error
 			condition += ` AND company_id = ? `
 			pars = append(pars, companyId)
 
-			airborneList, e := cygx.GetActivitySpecialTripAirborneListByActivitySpecial(condition, pars)
+			//airborneList, e := cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
+			//if e != nil {
+			//	err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
+			//	return
+			//}
+			//ariborneMap := make(map[int]int)
+			//for _, v := range airborneList {
+			//	ariborneMap[v.ChartPermissionId] = v.Count
+			//}
+			airborneTotal, e := cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
 			if e != nil {
 				err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
 				return
 			}
-			ariborneMap := make(map[int]int)
-			for _, v := range airborneList {
-				ariborneMap[v.ChartPermissionId] = v.Count
-			}
 			//condition += ` AND is_valid = 1 `
 			//查询当年的数据
 			condition += ` AND create_time >= ?  `
@@ -252,23 +257,31 @@ func GetSpecialSurplusByCompany(companyId int) (specialSurplus string, err error
 				err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
 				return
 			}
-			TripBillNumMap := make(map[int]int)
+			//TripBillNumMap := make(map[int]int)
+			//for _, v := range listTripBill {
+			//	TripBillNumMap[v.ChartPermissionId] += v.BillDetailed
+			//}
+			var TripBillNum int
 			for _, v := range listTripBill {
-				TripBillNumMap[v.ChartPermissionId] += v.BillDetailed
+				TripBillNum += v.BillDetailed
 			}
 			// CRM13.2 70w客户有16次专项调研, 45w有10次
 			packageTypeMap := map[int]int{1: 16, 2: 10}
 			totalTrip := packageTypeMap[packageType]
 
-			for k, _ := range chartNumMap {
-				tripRemaining := totalTrip - ariborneMap[k] + TripBillNumMap[k]
-				if tripRemaining < 0 {
-					tripRemaining = 0
-				}
-				specialSurplus += chartMap[k] + strconv.Itoa(tripRemaining) + "次,"
+			tripRemaining := totalTrip - airborneTotal + TripBillNum
+			if tripRemaining < 0 {
+				tripRemaining = 0
 			}
-			specialSurplus = strings.TrimRight(specialSurplus, ",")
-
+			//for k, _ := range chartNumMap {
+			//	tripRemaining := totalTrip - ariborneMap[k] + TripBillNumMap[k]
+			//	if tripRemaining < 0 {
+			//		tripRemaining = 0
+			//	}
+			//	specialSurplus += chartMap[k] + strconv.Itoa(tripRemaining) + "次,"
+			//}
+			//specialSurplus = strings.TrimRight(specialSurplus, ",")
+			specialSurplus = specialSurplus + "次"
 			//tripRemaining = 12 - tripTota
 		} else {
 			list, e := company.GetCompanyReportPermissionUpgrade(companyId, 2)