Merge branch 'cygx_10.9.1' into debug

# Conflicts:
#	controllers/company.go
#	services/cygx/activity_special.go

services/cygx/activity_special.go

@@ -234,6 +234,15 @@ func GetSpecialSurplusByCompany(companyId int) (specialSurplus string, err error
 			condition += ` AND company_id = ? `
 			pars = append(pars, companyId)
 
+			//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
+			//}
 			//到会空降的也加入流水记录表，这里不在做单独计算 2023-07-10
 			//airborneTota, e = cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
 			//if e != nil {
@@ -249,22 +258,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 + TripBillNumMap[k]
-				if tripRemaining < 0 {
-					tripRemaining = 0
-				}
-				specialSurplus += chartMap[k] + strconv.Itoa(tripRemaining) + "次,"
+			tripRemaining := totalTrip + 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)
@@ -431,11 +449,12 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			//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
-			}
+			//到会空降的也加入流水记录表，这里不在做单独计算 2023-07-10
+			//airborneTotal, e := cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
+			//if e != nil {
+			//	err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
+			//	return
+			//}
 			//condition += ` AND is_valid = 1 `
 			//查询当年的数据
 			condition += ` AND create_time >= ?  `
@@ -457,7 +476,7 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			packageTypeMap := map[int]int{1: 16, 2: 10}
 			totalTrip := packageTypeMap[packageType]
 
-			tripRemaining := totalTrip - airborneTotal + TripBillNum
+			tripRemaining := totalTrip + TripBillNum
 			if tripRemaining < 0 {
 				tripRemaining = 0
 			}
@@ -496,14 +515,15 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			if len(chartList) == 0 {
 				return
 			}
-			airborneList, e := cygx.GetCygxActivitySpecialTripAirborneListByComapnyId(companyId)
-			if e != nil {
-				err = errors.New("获取品种信息失败, Err:" + e.Error())
-				return
-			}
-			for _, v := range airborneList {
-				mapPermissionNameTrip[v.ChartPermissionName] += 1
-			}
+			//到会空降的也加入流水记录表，这里不在做单独计算 2023-07-10
+			//airborneList, e := cygx.GetCygxActivitySpecialTripAirborneListByComapnyId(companyId)
+			//if e != nil {
+			//	err = errors.New("获取品种信息失败, Err:" + e.Error())
+			//	return
+			//}
+			//for _, v := range airborneList {
+			//	mapPermissionNameTrip[v.ChartPermissionName] += 1
+			//}
 
 			var condition string
 			var pars []interface{}