修改pars bug

controllers/report_author.go

@@ -117,7 +117,7 @@ func (this *ReportAuthorController) AddAuthor() {
 		br.ErrMsg = "获取数据异常，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.Id > 0 {
 		br.Msg = "已存在该作者"
 		br.ErrMsg = "已存在该作者"
 		br.IsSendEmail = false

models/data_manage/base_from_oilchem.go

@@ -153,7 +153,7 @@ func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{})
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_OILCHEM)).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_OILCHEM)...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_sci_hq_index.go

@@ -100,7 +100,7 @@ func GetSciHqIndexAndEdbInfoByCondition(condition string, pars []interface{}) (i
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = o.Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)).Scan(&items).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -98,13 +98,22 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	if num <= 0 {
 		return
 	}
+	edbIdArr := make([]string, 0)
+	for _, v := range edbIdList {
+		edbIdArr = append(edbIdArr, strconv.Itoa(v))
+	}
+	edbIdStr := strings.Join(edbIdArr, ",")
 	o := global.DmSQL["data"]
+	//sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
+	//         FROM edb_info
+	//		 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
+	//		ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `) `
+
 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
-             FROM edb_info
-			 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
-			ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `)
-              `
-	err = o.Raw(sql, edbIdList, edbIdList).Scan(&list).Error
+	        FROM edb_info
+			 WHERE edb_info_id IN(` + edbIdStr + `)
+			ORDER BY FIELD(edb_info_id,` + edbIdStr + `) `
+	err = o.Raw(sql).Find(&list).Error
 
 	return
 }

models/data_manage/chart_info.go

@@ -496,6 +496,7 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 		return list, err
 	}
 	var pars []interface{}
+	//pars = append(pars, edbInfoId)
 	sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? `
 	if startDate != "" {
 		sql += ` AND data_time>=? `
@@ -509,8 +510,9 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)).Scan(&list).Error
 
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)...).Scan(&list).Error
+	//err = o.Raw(sql, pars...).Scan(&list).Error
 	return
 }
 
@@ -646,7 +648,7 @@ func getEdbDataListMinAndMaxByMysql(source, subSource, edbInfoId int, startDate,
 
 	var tmpData MaxOrMinData
 
-	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)).Scan(&tmpData).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)...).Scan(&tmpData).Error
 	if err != nil {
 		return
 	}

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -83,7 +83,7 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 
 	sql += ` ORDER BY data_time ASC `
 
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, endInfoId)).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, endInfoId)...).Find(&list).Error
 	return
 }
 

models/data_manage/future_good/future_good_edb_info_data.go

@@ -100,7 +100,7 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoId)).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoId)...).Scan(&list).Error
 
 	return
 }
@@ -118,7 +118,7 @@ func GetFutureGoodEdbDataListByIdsAndDate(futureGoodEdbInfoIds []int, startDate,
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoIds)).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoIds)...).Scan(&list).Error
 
 	return
 }

models/data_manage/mysteel_chemical_index.go

@@ -116,7 +116,7 @@ func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)...).Find(&items).Error
 	return
 }
 

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -39,7 +39,7 @@ func GetVarietyEdbData(varietyEdbId int, startDate, endDate string) (items []*Ba
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, varietyEdbId)).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, varietyEdbId)...).Scan(&items).Error
 
 	return
 }

models/target.go

@@ -229,7 +229,7 @@ func GetEdbinfoListCount(condition string, pars []interface{}, mobile string, ro
 			sql += condition
 		}
 		//err = o.Raw(sql, mobile, pars).QueryRow(&count)
-		err = global.DmSQL["edb"].Raw(sql, utils.ForwardPars(pars, mobile)).Scan(&count).Error
+		err = global.DmSQL["edb"].Raw(sql, utils.ForwardPars(pars, mobile)...).Scan(&count).Error
 	} else {
 		sql = `SELECT COUNT(1) AS count FROM edbinfo AS a WHERE a.classify_id>0`