Merge remote-tracking branch 'origin/debug' into debug

controllers/data_manage/chart_framework.go

@@ -249,9 +249,12 @@ func (this *ChartFrameworkController) Add() {
 			t.MyChartClassifyId = v.MyChartClassifyId
 			t.CreateTime = now
 			nodes = append(nodes, t)
-
+			num, ok := chartsNumMap[v.MyChartClassifyId]
+			if !ok {
+				num = 0
+			}
 			// 响应节点数据
-			td := data_manage.FormatChartFrameworkNode2Item(t, chartsNumMap[t.MyChartClassifyId])
+			td := data_manage.FormatChartFrameworkNode2Item(t, num)
 			itemNodes = append(itemNodes, td)
 		}
 	}
@@ -791,7 +794,11 @@ func (this *ChartFrameworkController) Detail() {
 		if v.NodeId == "" {
 			continue
 		}
-		itemNodes = append(itemNodes, data_manage.FormatChartFrameworkNode2Item(v, chartsNumMap[v.MyChartClassifyId]))
+		num, ok := chartsNumMap[v.MyChartClassifyId]
+		if !ok {
+			num = 0
+		}
+		itemNodes = append(itemNodes, data_manage.FormatChartFrameworkNode2Item(v, num))
 	}
 	detail := data_manage.FormatChartFramework2Item(item, itemNodes)
 

controllers/data_source/guagnzhouqihuo.go

@@ -190,13 +190,13 @@ func (this *DataSourceController) GfexIndexData() {
 	condition += ` AND b.base_from_trade_guangzhou_classify_id=? `
 	pars = append(pars, baseFromTradeGuangzhouClassifyId)
 
-	if baseFromTradeGuangzhouContractId > 0 {
-		condition += ` AND c.base_from_trade_guangzhou_contract_id=? `
-		pars = append(pars, baseFromTradeGuangzhouContractId)
-	}
+	//if baseFromTradeGuangzhouContractId > 0 {
+	//	condition += ` AND c.base_from_trade_guangzhou_contract_id=? `
+	//	pars = append(pars, baseFromTradeGuangzhouContractId)
+	//}
 
 	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
-	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndex(condition, pars)
+	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndex(condition, pars, baseFromTradeGuangzhouContractId)
 	if err != nil {
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		br.Msg = "获取数据失败"

models/data_source/guagnzhouqihuo.go

@@ -87,19 +87,35 @@ type BaseFromTradeGuangzhouIndexView struct {
 	Value                            float64 `description:"数据"`
 }
 
-func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}) (list []*BaseFromTradeGuangzhouIndexView, err error) {
+func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}, baseFromTradeGuangzhouContractId int) (list []*BaseFromTradeGuangzhouIndexView, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
+	if baseFromTradeGuangzhouContractId <= 0 {
+		sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
  FROM base_from_trade_guangzhou_data AS a
 INNER JOIN base_from_trade_guangzhou_index AS b ON a.base_from_trade_guangzhou_index_id=b.base_from_trade_guangzhou_index_id
 LEFT JOIN base_from_trade_guangzhou_contract AS c ON b.base_from_trade_guangzhou_classify_id=c.base_from_trade_guangzhou_classify_id
-WHERE 
+WHERE `
+		if condition != "" {
+			sql += condition
+		}
+		sql += ` ORDER BY a.index_code ASC `
+		_, err = o.Raw(sql, pars).QueryRows(&list)
+		return
+	} else {
+		condition += ` AND c.base_from_trade_guangzhou_contract_id=? `
+		pars = append(pars, baseFromTradeGuangzhouContractId)
 
- `
-	if condition != "" {
-		sql += condition
+		sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
+ FROM base_from_trade_guangzhou_data AS a
+INNER JOIN base_from_trade_guangzhou_index AS b ON a.base_from_trade_guangzhou_index_id=b.base_from_trade_guangzhou_index_id
+INNER JOIN base_from_trade_guangzhou_contract AS c ON b.base_from_trade_guangzhou_classify_id=c.base_from_trade_guangzhou_classify_id
+WHERE `
+
+		if condition != "" {
+			sql += condition
+		}
+		sql += ` ORDER BY a.index_code ASC `
+		_, err = o.Raw(sql, pars).QueryRows(&list)
+		return
 	}
-	sql += ` ORDER BY a.index_code ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-	return
 }