change gorm

controllers/data_manage/predict_edb_info.go

@@ -1614,7 +1614,7 @@ func (this *PredictEdbInfoController) ChartDataList() {
 		endNumList := make([]int, 0)
 		for _, v := range req.RuleList {
 			if req.EndDateType == 0 {
-				confEndDate, err := time.Parse(utils.FormatDate, v.EndDate)
+				confEndDate, err := time.ParseInLocation(utils.FormatDate, v.EndDate, time.Local)
 				if err != nil {
 					br.Msg = "配置项中时间异常，请重新选择"
 					br.ErrMsg = "配置项中时间异常，请重新选择,err:" + err.Error()

models/ai_predict_model/ai_predict_model_classify.go

@@ -348,3 +348,12 @@ func RemoveAiPredictModelClassify(classifyId int) (err error) {
 	err = o.Exec(sql, classifyId).Error
 	return
 }
+
+// GetAiPredictClassifyByParentIdAndName 根据父级ID和名称获取分类
+func GetAiPredictClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *AiPredictModelClassify, err error) {
+	//o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM ai_predict_model_classify WHERE parent_id = ? AND classify_name = ? AND ai_predict_model_classify_id <> ? LIMIT 1`
+	//err = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+	return
+}

services/ai_predict_model_classify.go

@@ -71,13 +71,13 @@ func AiPredictModelMoveClassify(req aiPredictModel.AiPredictModelClassifyMoveReq
 			return
 		}
 		// 如果是移动目录, 那么校验一下父级目录下是否有重名目录
-		exists, e := data_manage.GetEdbClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId)
+		exists, e := aiPredictModel.GetAiPredictClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId)
 		if e != nil && !utils.IsErrNoRow(e) {
 			errMsg = "移动失败"
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())
 			return
 		}
-		if exists != nil {
+		if exists != nil && exists.AiPredictModelClassifyId > 0 {
 			errMsg = "移动失败，分类名称已存在"
 			return
 		}

services/data/predict_edb_info.go

@@ -1016,6 +1016,9 @@ func GetChartDataList(dataList []*data_manage.EdbDataList, chartType int, calend
 		newStartDateReal = newStartDateReal.AddDate(-1, 0, 0)
 		startDateReal = newStartDateReal.Format(utils.FormatDate)
 	}
+	if latestDateStr == `` {
+		return
+	}
 	//实际数据的截止日期
 	latestDate, tmpErr := time.Parse(utils.FormatDate, latestDateStr)
 	if tmpErr != nil {

services/ppt/ppt_english_group.go

@@ -21,7 +21,7 @@ func AddEnglishGroup(groupName string, adminId int, isShare int8, isSharedAdd in
 		err = errors.New("目录查询出错:" + err.Error())
 		return
 	}
-	if item != nil {
+	if item != nil && item.GroupId > 0 {
 		err = errors.New("目录名称已存在，不可重复添加")
 		return
 	}