Merge branch 'eta/2.0.0' into debug

# Conflicts:
#	models/target.go

controllers/data_manage/manual_edb.go

@@ -522,6 +522,8 @@ func (c *ManualEdbController) EditExcelData() {
 
 			if len(updateCols) > 0 {
 				isUpdate = true
+				manualEdbInfo.ModifyTime = time.Now().Format(utils.FormatDateTime)
+				updateCols = append(updateCols, "ModifyTime")
 				err = manualEdbInfo.Update(updateCols)
 				if err != nil {
 					br.Msg = `指标保存失败`
@@ -626,6 +628,7 @@ func (c *ManualEdbController) EditExcelData() {
 				CreateTime: time.Now(),
 			}
 			go func() {
+				data.ModifyManualEdbMaxMinDate(manualEdbInfo.TradeCode)
 				_ = record.Create()
 			}()
 		}

controllers/target.go

@@ -201,6 +201,7 @@ func (this *TargetController) DataAdd() {
 			UserName:   this.SysUser.RealName,
 			CreateTime: time.Now(),
 		}
+		data.ModifyManualEdbMaxMinDate(edbdata.TradeCode)
 		_ = record.Create()
 	}()
 

models/target.go

@@ -196,6 +196,8 @@ type Edbinfo struct {
 	Sort         int    `orm:"column(sort)" description:"排序"`
 	ModifyTime   string `description:"最近一次更新时间"`
 	IsJoinEdb    int8   `description:"指标库是否已添加：0-否；1-是"`
+	StartDate  string `description:"数据开始日期"`
+	EndDate    string `description:"数据结束日期"`
 }
 
 func DeleteEdbinfoByTraceCodeList(tradeCodeList []string) (err error) {
@@ -260,6 +262,8 @@ type EdbinfoItem struct {
 	NoticeTime   string `description:"通知时间"`
 	Mobile       string `description:"录入者手机号"`
 	ModifyTime   string `description:"最近一次更新时间"`
+	StartDate    string `description:"数据开始日期"`
+	EndDate      string `description:"数据结束日期"`
 }
 
 func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSize int, mobile string, roleType int) (items []*EdbinfoItem, err error) {
@@ -1734,3 +1738,43 @@ func GetChildManualEdbClassifyByIdList(idList []int) (items []*EdbdataClassify,
 
 	return
 }
+
+// EdbinfoMaxMinDate
+// @Description: 手工指标的最小最大日期
+type EdbinfoMaxMinDate struct {
+	MinDate string
+	MaxDate string
+}
+
+// GetEdbdataMaxMinDate
+// @Description: 获取手工指标的最小最大日期
+// @author: Roc
+// @datetime 2024-08-01 14:27:20
+// @param tradeCode string
+// @return item EdbinfoMaxMinDate
+// @return err error
+func GetEdbdataMaxMinDate(tradeCode string) (item EdbinfoMaxMinDate, err error) {
+	o := orm.NewOrmUsingDB("edb")
+
+	sql := ` SELECT MIN(DT) min_date,MAX(DT) max_date FROM edbdata WHERE TRADE_CODE = ? `
+	err = o.Raw(sql, tradeCode).QueryRow(&item)
+
+	return
+}
+
+// ModifyEdbinfoMaxMinDate
+// @Description: 修改手工指标的最小最大日期
+// @author: Roc
+// @datetime 2024-08-01 15:33:45
+// @param startDate string
+// @param endDate string
+// @param tradeCode string
+// @return err error
+func ModifyEdbinfoMaxMinDate(startDate, endDate, tradeCode string) (err error) {
+	o := orm.NewOrmUsingDB("edb")
+
+	sql := ` UPDATE edbinfo SET start_date = ?, end_date = ? WHERE TRADE_CODE = ? `
+	_, err = o.Raw(sql, startDate, endDate, tradeCode).Exec()
+
+	return
+}

services/data/manual.go

@@ -241,6 +241,9 @@ func ImportManualData(path string, sysUser *system.Admin) (successCount, failCou
 				UserName:   sysUser.RealName,
 				CreateTime: time.Now(),
 			})
+
+			// 修改最大最小值
+			go ModifyManualEdbMaxMinDate(tradeCode)
 		}
 		if len(recordList) > 0 {
 			go func() {
@@ -628,8 +631,6 @@ type ImportManualIndexData struct {
 	DataMap   map[string]string `description:"时间数据"`
 }
 
-// TODO 模板数据获取异常的结果记录
-
 // getDataByTemplate1
 // @Description: 根据模板1获取数据
 // @author: Roc
@@ -1028,3 +1029,19 @@ func getExcelDate(createDate string) (newCreateDate string, err error) {
 
 	return
 }
+
+// ModifyManualEdbMaxMinDate
+// @Description: 修改手动录入的edb数据的最大最小日期
+// @author: Roc
+// @datetime 2024-08-01 15:34:31
+// @param tradeCode string
+func ModifyManualEdbMaxMinDate(tradeCode string) {
+	item, err := models.GetEdbdataMaxMinDate(tradeCode)
+	if err != nil {
+		return
+	}
+
+	err = models.ModifyEdbinfoMaxMinDate(item.MinDate, item.MaxDate, tradeCode)
+
+	return
+}