处理平衡表图表

services/data/chart_info_excel_balance.go

@@ -603,72 +603,6 @@ func GetBalanceExcelChartDetail(chartInfo *data_manage.ChartInfoView, mappingLis
 	if err != nil {
 		return
 	}
-	//循环组装映射关系
-	/*for _, v := range mappingListTmp {
-		dataList := make([]*data_manage.EdbDataList, 0)
-		dataListTmp, ok := dataListMap[v.ExcelChartEdbId]
-		if ok {
-			dataList = dataListTmp
-		} else {
-			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.ExcelChartEdbId))
-			return
-		}
-		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
-		mapping := &data_manage.ChartEdbInfoMapping{
-			EdbInfoId:         v.ExcelChartEdbId,
-			SourceName:        "",
-			Source:            0,
-			SubSource:         0,
-			EdbCode:           v.EdbCode,
-			EdbName:           v.EdbName,
-			EdbAliasName:      v.EdbName,
-			EdbNameEn:         "",
-			EdbAliasNameEn:    "",
-			EdbType:           0,
-			Frequency:         "",
-			FrequencyEn:       "",
-			Unit:              "",
-			UnitEn:            "",
-			StartDate:         startDateStr,
-			EndDate:           endDateStr,
-			ModifyTime:        v.ModifyTime.Format(utils.FormatDateTime),
-			ChartEdbMappingId: v.ExcelChartEdbId,
-			ChartInfoId:       chartInfoId,
-			MaxData:           v.MaxData,
-			MinData:           v.MinData,
-			IsOrder:           v.IsOrder,
-			IsAxis:            v.IsAxis,
-			//EdbInfoType:         0,
-			//EdbInfoCategoryType: 0,
-			LeadValue:         v.LeadValue,
-			LeadUnit:          v.LeadUnit,
-			LeadUnitEn:        "",
-			ChartStyle:        "",
-			ChartColor:        "",
-			PredictChartColor: "",
-			ChartWidth:        v.ChartWidth,
-			ChartType:         chartType,
-			LatestDate:        endDateStr,
-			LatestValue:       endVal,
-			MoveLatestDate:    "",
-			UniqueCode:        "",
-			MinValue:          minValue,
-			MaxValue:          maxValue,
-			DataList:          nil,
-			IsNullData:        false,
-			MappingSource:     0,
-			RegionType:        "",
-			ClassifyId:        0,
-			IsConvert:         0,
-			ConvertType:       0,
-			ConvertValue:      0,
-			ConvertUnit:       "",
-			ConvertEnUnit:     "",
-			IsJoinPermission:  0,
-			HaveOperaAuth:     true,
-		}
-		mappingList = append(mappingList, mapping)
-	}*/
 	if chartType == 2 {
 		startDate = seasonStartDate
 		endDate = seasonEndDate
@@ -799,8 +733,8 @@ func GetBalanceExcelChartDetail(chartInfo *data_manage.ChartInfoView, mappingLis
 		resp.EdbInfoList = mappingList
 	}
 
-	//图表操作权限
-	chartInfo.IsEdit = CheckOpChartPermission(sysUser, chartInfo.SysUserId, chartInfo.HaveOperaAuth)
+	// todo 平衡表图表操作权限平衡表表格的操作权限保持一致，前端未用到该按钮权限，故不处理
+	//chartInfo.IsEdit = CheckOpChartPermission(sysUser, chartInfo.SysUserId, chartInfo.HaveOperaAuth)
 	chartInfo.Button = data_manage.ChartViewButton{
 		IsEdit:    chartInfo.IsEdit,
 		IsEnChart: chartInfo.IsEnChart,
@@ -944,8 +878,8 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 		if ok {
 			dataList = dataListTmp
 		} else {
-			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.EdbInfoId))
-			return
+			//err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.EdbInfoId))
+			utils.FileLog.Info(fmt.Sprintf("获取失败,指标数据异常 %d", v.EdbInfoId))
 		}
 		if v.IsConvert == 1 {
 			switch v.ConvertType {
@@ -1667,8 +1601,8 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 		if ok {
 			dataList = dataListTmp
 		} else {
-			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.ExcelChartEdbId))
-			return
+			//err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.ExcelChartEdbId))
+			utils.FileLog.Info(fmt.Sprintf("获取失败,指标数据异常 %d", v.ExcelChartEdbId))
 		}
 		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
 		mapping := &data_manage.ChartEdbInfoMapping{