Roc 2 months ago
parent
commit
d34adc605b

+ 1 - 1
controllers/data_manage/cross_variety/variety.go

@@ -114,7 +114,7 @@ func (c *VarietyController) Edit() {
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
 	}
-	if item != nil && item.ChartVarietyId != req.ChartVarietyId {
+	if item != nil && item.ChartVarietyId > 0 && item.ChartVarietyId != req.ChartVarietyId {
 		br.Msg = "添加失败,品种名称不能重复"
 		br.IsSendEmail = false
 		return

+ 1 - 1
controllers/data_manage/supply_analysis/variety.go

@@ -224,7 +224,7 @@ func (this *VarietyController) Edit() {
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
 	}
-	if item != nil && item.VarietyId != req.VarietyId {
+	if item != nil && item.VarietyId > 0 && item.VarietyId != req.VarietyId {
 		br.Msg = "添加失败,品种名称不能重复"
 		br.IsSendEmail = false
 		return

+ 12 - 0
services/data/range_analysis/chart_info.go

@@ -539,6 +539,13 @@ func GetChartDataByEdbInfoList(chartInfoId int, dateType, startYear int, startDa
 }
 
 func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int, startDate, endDate string, edbInfoMappingList []*data_manage.ChartEdbInfoMapping, req *data_manage.ChartRangeAnalysisExtraConf) (edbList []*data_manage.ChartEdbInfoMapping, xEdbIdValue []int, dataResp data_manage.ChartRangeAnalysisDataResp, err error) {
+	fmt.Println(chartInfoId)
+	fmt.Println(dateType)
+	fmt.Println(startYear)
+	fmt.Println(startDate)
+	fmt.Println(endDate)
+	fmt.Println(edbInfoMappingList)
+	fmt.Println(req)
 	//查询seriesId
 	chartSeriesOb := new(data_manage.FactorEdbSeriesChartMapping)
 	seriesMappingItem, err := chartSeriesOb.GetItemByChartInfoId(chartInfoId)
@@ -573,6 +580,7 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
 		edbInfoMapping.DataList = dataList
 		// 处理上下限
 		var maxData, minData float64
+		fmt.Println("数据长度:", len(dataList))
 		if len(dataList) > 0 {
 			maxData = dataList[0].Value
 			minData = dataList[0].Value
@@ -644,6 +652,10 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
 			edbInfoMappingList[k].MaxData = maxData
 		}
 	}
+
+	if len(edbInfoMappingList) > 0 {
+		fmt.Println("dataList Len:", edbInfoMappingList[0].DataList)
+	}
 	dataResp = data_manage.ChartRangeAnalysisDataResp{ChartRangeAnalysisExtraConf: req, SeriesId: seriesMappingItem.FactorEdbSeriesId}
 	// 查询配置关联关系
 	if req.MultipleGraphConfigId > 0 {