fix

controllers/company.go

@@ -9209,18 +9209,18 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 	}
 
 
-	specialSurplus, err := cygxService.GetSpecialSurplusByCompany(companyId)
+	userType, chartNumMap,mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(companyId)
 	if err != nil {
 		br.Msg = "获取专项调研剩余次数失败"
 		br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
 		return
 	}
+	chartMap := map[int]string{utils.YI_YAO_ID:utils.YI_YAO_NAME, utils.XIAO_FEI_ID:utils.XIAO_FEI_NAME, utils.KE_JI_ID:utils.KE_JI_NAME, utils.ZHI_ZAO_ID:utils.ZHI_ZAO_NAME}
 	resp := new(cygx.CygxActivitySpecialPointsBillResp)
 	for _, v := range list {
 		item := cygx.CygxActivitySpecialPointsBillRespItem{
 			Id:                  v.Id,
 			Content:             v.ActivityName,
-			Total:               specialSurplus,
 			CreateTime:          v.CreateTime.Format(utils.FormatDateTime),
 			CompanyId:           v.CompanyId,
 			CompanyName:         v.CompanyName,
@@ -9230,6 +9230,21 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 			ChartPermissionId:   v.ChartPermissionId,
 			ChartPermissionName: v.ChartPermissionName,
 		}
+		if userType == 2 {
+			for k, _ := range chartNumMap {
+				item.Total += chartMap[k] + strconv.Itoa(chartNumMap[v.ChartPermissionId] - v.BillDetailed) + "次,"
+			}
+			item.Total = strings.TrimRight(item.Total, "次")
+		} else {
+			for k, num := range mapChartName {
+				if num > 0 {
+					item.Total += k + strconv.Itoa(num - v.BillDetailed) + "次+"
+				}
+			}
+			item.Total = strings.TrimRight(item.Total, "+")
+		}
+	
+
 		resp.List = append(resp.List, &item)
 	}
 

services/cygx/activity_special.go

@@ -414,7 +414,7 @@ func CheckActivitySpecialUpdatePower(adminId int, activityInfo *cygx.ActivitySpe
 }
 
 // GetChartPermissionSpecialSurplusByCompany 获取公司专项调研次数-分品种
-func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[int]int, err error) {
+func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, chartNumMap  map[int]int,mapChartName map[string]int, err error) {
 	companyDetail, e := cygx.GetCompanyDetailByIdGroup(companyId)
 	if e != nil {
 		err = errors.New("GetCompanyDetailByIdGroup, Err: " + e.Error())
@@ -432,7 +432,8 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 	//chartMap := map[int]string{utils.YI_YAO_ID:utils.YI_YAO_NAME, utils.XIAO_FEI_ID:utils.XIAO_FEI_NAME, utils.KE_JI_ID:utils.KE_JI_NAME, utils.ZHI_ZAO_ID:utils.ZHI_ZAO_NAME}
 	chartNumMap = map[int]int{utils.YI_YAO_ID:0, utils.XIAO_FEI_ID:0, utils.KE_JI_ID:0, utils.ZHI_ZAO_ID:0}
 	if companyDetail.Status == "正式" {
-		userType, packageType, _, _, _ := GetUserType(companyId)
+		var packageType int
+		userType, packageType, _, _, _ = GetUserType(companyId)
 		if userType == 2 {
 			var condition string
 			var pars []interface{}
@@ -500,7 +501,7 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 				return
 			}
 			var chartPermissionIdSlice []string
-			mapChartName := make(map[string]int)
+			mapChartName = make(map[string]int)
 			mapPermissionNameTrip := make(map[string]int)
 			//mapPermissionName := make(map[int]string)
 			for _, v := range list {