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

models/data_manage/excel/excel_edb_mapping.go

@@ -141,12 +141,12 @@ func GetExcelEdbMappingByEdbInfoIdAndSource(edbInfoId int, sources []int) (items
 // @Description: 根据指标id删除与自定义分析表格的关系
 // @author: Roc
 // @datetime 2023-11-02 13:20:02
-// @param excelInfoId int
+// @param edbInfoId int
 // @return err error
-func DeleteCustomAnalysisExcelEdbMappingByEdbInfoId(excelInfoId int) (err error) {
+func DeleteCustomAnalysisExcelEdbMappingByEdbInfoId(edbInfoId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
-	_, err = o.Raw(sql, utils.CUSTOM_ANALYSIS_TABLE, excelInfoId).Exec()
+	_, err = o.Raw(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Exec()
 
 	return
 }

models/manual_edb.go

@@ -167,7 +167,7 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 	}
 
 	o := orm.NewOrmUsingDB("edb")
-	sql := `delete from  edbdata AS a  WHERE a.TRADE_CODE=? and DT in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `delete from edbdata  WHERE TRADE_CODE=? AND DT in (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, tradeCode, dateList).Exec()
 
 	return