广期所修改bug

controllers/data_source/guagnzhouqihuo.go

@@ -273,8 +273,15 @@ func (this *DataSourceController) GfexIndexDetail() {
 	condition += ` a.base_from_trade_guangzhou_classify_id = ? `
 	pars = append(pars, baseFromTradeGuangzhouIndexId)
 
-	condition += ` a.end_date = ? `
-	pars = append(pars, tradeDate)
+	td, err := time.Parse(utils.FormatDate, tradeDate)
+	if err != nil {
+		br.Msg = "日期格式错误"
+		br.ErrMsg = "日期格式错误,Err:" + err.Error()
+		return
+	}
+	_, monthEndDay := utils.GetMonthStartAndEnd(strconv.Itoa(td.Year()), strconv.Itoa(int(td.Month())))
+	condition += ` AND a.end_date = ? `
+	pars = append(pars, monthEndDay)
 
 	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
 	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndexDetail(condition, pars)
@@ -326,8 +333,15 @@ func (this *DataSourceController) ExportGfexIndexDetail() {
 	condition += ` a.base_from_trade_guangzhou_classify_id = ? `
 	pars = append(pars, baseFromTradeGuangzhouIndexId)
 
-	condition += ` a.end_date = ? `
-	pars = append(pars, tradeDate)
+	td, err := time.Parse(utils.FormatDate, tradeDate)
+	if err != nil {
+		br.Msg = "日期格式错误"
+		br.ErrMsg = "日期格式错误,Err:" + err.Error()
+		return
+	}
+	_, monthEndDay := utils.GetMonthStartAndEnd(strconv.Itoa(td.Year()), strconv.Itoa(int(td.Month())))
+	condition += ` AND a.end_date = ? `
+	pars = append(pars, monthEndDay)
 
 	gzqhObj := new(data_source.BaseFromTradeGuangzhouIndex)
 	list, err := gzqhObj.GetBaseFromTradeGuangzhouIndexDetail(condition, pars)