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

controllers/data_manage/ai_predict_model/framework.go

@@ -633,7 +633,7 @@ func (c *AiPredictModelFrameworkController) Detail() {
 		indexIdNum := len(aiPredictModelIndexIdList)
 		if indexIdNum > 0 {
 			indexObj := aiPredictModel.AiPredictModelIndex{}
-			indexList, e := indexObj.GetItemsByCondition(` AND ai_predict_model_index_id in (`+utils.GetOrmInReplace(indexIdNum)+`)`, aiPredictModelIndexIdList, []string{}, "")
+			indexList, e := indexObj.GetItemsByCondition(` AND ai_predict_model_index_id in (`+utils.GetOrmInReplace(indexIdNum)+`)`, []interface{}{aiPredictModelIndexIdList}, []string{}, "")
 			if e != nil {
 				if utils.IsErrNoRow(e) {
 					br.Msg = "框架不存在, 请刷新页面"

models/permission.go

@@ -43,7 +43,10 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			_ = to.Commit()
 		}
 	}()
-	sql := "DELETE FROM chart_permission_search_key_word_mapping AS a WHERE a.from = 'rddp' AND a.classify_id = ?"
+	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE `from` = 'rddp' AND classify_id = ?"
+	if utils.DbDriverName == `dm` {
+		sql = "DELETE FROM chart_permission_search_key_word_mapping AS a WHERE a.from = 'rddp' AND a.classify_id = ?"
+	}
 	sql = utils.ReplaceDriverKeywords("", sql)
 	err = to.Exec(sql, classifyId).Error
 	if err != nil {

models/target.go

@@ -80,6 +80,13 @@ type Edbdata struct {
 	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *Edbdata) AfterFind(db *gorm.DB) (err error) {
+	m.Dt = utils.GormDateStrToDateStr(m.Dt)
+
+	return
+}
+
 type EdbDataNextDateTime struct {
 	TradeCode  string    `gorm:"column:TRADE_CODE;pk" description:"指标编码"`
 	Dt         string    `gorm:"column:DT" description:"日期"`
@@ -89,6 +96,14 @@ type EdbDataNextDateTime struct {
 	NextDateTime string `description:"下期日期"`
 }
 
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *EdbDataNextDateTime) AfterFind(db *gorm.DB) (err error) {
+	m.Dt = utils.GormDateStrToDateStr(m.Dt)
+	m.NextDateTime = utils.GormDateStrToDateStr(m.NextDateTime)
+
+	return
+}
+
 func GetDataInfo(tradeCode, creteDate string) (item *Edbdata, err error) {
 	sql := " SELECT * FROM edbdata WHERE TRADE_CODE=? AND DT=? "
 	o := global.DbMap[utils.DbNameManualIndex]
@@ -1336,8 +1351,8 @@ type LongzhongSurveyProduct struct {
 }
 
 func (obj *LongzhongSurveyProduct) AfterFind(tx *gorm.DB) (err error) {
-			obj.StartDate = utils.GormDateStrToDateStr(obj.StartDate)
-			obj.EndDate = utils.GormDateStrToDateStr(obj.EndDate)
+	obj.StartDate = utils.GormDateStrToDateStr(obj.StartDate)
+	obj.EndDate = utils.GormDateStrToDateStr(obj.EndDate)
 	return
 }
 func GetLongzhongSurveyProductByClassifyName(productName string) (items []*LongzhongSurveyProduct, err error) {
@@ -1774,8 +1789,8 @@ type EdbinfoMaxMinDate struct {
 }
 
 func (mmDate *EdbinfoMaxMinDate) AfterFind(tx *gorm.DB) (err error) {
-			mmDate.MinDate = utils.GormDateStrToDateStr(mmDate.MinDate)
-			mmDate.MaxDate = utils.GormDateStrToDateStr(mmDate.MaxDate)
+	mmDate.MinDate = utils.GormDateStrToDateStr(mmDate.MinDate)
+	mmDate.MaxDate = utils.GormDateStrToDateStr(mmDate.MaxDate)
 	return
 }
 

services/ppt.go

@@ -295,7 +295,7 @@ func ResetPPTReport(reportId int, isEnglish bool) (err error) {
 			err = errors.New("获取英文PPT失败, Err: " + e.Error())
 			return
 		}
-		if en != nil {
+		if en != nil && en.PptId > 0 {
 			updateCols := []string{"ReportId", "ReportCode"}
 			en.ReportId = 0
 			en.ReportCode = ""
@@ -313,7 +313,7 @@ func ResetPPTReport(reportId int, isEnglish bool) (err error) {
 		err = errors.New("获取PPT失败, Err: " + e.Error())
 		return
 	}
-	if item != nil {
+	if item != nil && item.PptId > 0 {
 		updateCols := []string{"ReportId", "ReportCode"}
 		item.ReportId = 0
 		item.ReportCode = ""