fix:stl指标保存

services/data/stl/stl.go

@@ -791,34 +791,6 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		msg = "生成指标代码失败"
 		return
 	}
-	var dataList []*stl.EdbDataCalculateStl
-	var startDate, endDate time.Time
-	for _, v := range edbInfoData {
-		dataTime, _ := time.Parse(utils.FormatDate, v.DataTime)
-		if startDate.IsZero() || dataTime.Before(startDate) {
-			startDate = dataTime
-		}
-		if endDate.IsZero() || dataTime.After(endDate) {
-			endDate = dataTime
-		}
-		dataList = append(dataList, &stl.EdbDataCalculateStl{
-			EdbInfoId:     req.EdbInfoId,
-			EdbCode:       edbCode,
-			DataTime:      dataTime,
-			Value:         v.Value,
-			CreateTime:    time.Now(),
-			ModifyTime:    time.Now(),
-			DataTimestamp: dataTime.UnixMilli(),
-		})
-	}
-	err = indexObj.BatchInsert(dataList)
-	if err != nil {
-		msg = "保存失败"
-		return
-	}
-
-	startDateStr := startDate.Format(utils.FormatDate)
-	endDateStr := endDate.Format(utils.FormatDate)
 
 	//判断指标名称是否存在
 	ok, err := CheckDulplicateEdbInfoName(req.EdbName, lang)
@@ -850,8 +822,6 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 	edbInfo.Frequency = req.Frequency
 	edbInfo.Unit = req.Unit
 	edbInfo.UnitEn = req.Unit
-	edbInfo.StartDate = startDateStr
-	edbInfo.EndDate = endDateStr
 	edbInfo.CalculateFormula = conf.Config
 	edbInfo.ClassifyId = req.ClassifyId
 	edbInfo.SysUserId = adminId
@@ -879,6 +849,26 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		return
 	}
 	edbInfo.EdbInfoId = int(edbInfoId)
+
+	var dataList []*stl.EdbDataCalculateStl
+	for _, v := range edbInfoData {
+		dataTime, _ := time.Parse(utils.FormatDate, v.DataTime)
+		dataList = append(dataList, &stl.EdbDataCalculateStl{
+			EdbInfoId:     int(edbInfoId),
+			EdbCode:       edbCode,
+			DataTime:      dataTime,
+			Value:         v.Value,
+			CreateTime:    time.Now(),
+			ModifyTime:    time.Now(),
+			DataTimestamp: dataTime.UnixMilli(),
+		})
+	}
+	err = indexObj.BatchInsert(dataList)
+	if err != nil {
+		msg = "保存失败"
+		return
+	}
+
 	//保存数据
 	data_manage.ModifyEdbInfoDataStatus(edbInfoId, source, subSource, edbCode)