Roc 4 luni în urmă
părinte
comite
ca642d4c01

+ 18 - 1
models/data_manage/mysteel_chemical_index.go

@@ -508,6 +508,23 @@ func GetMysteelChemicalGroupTerminalNum() (items []*TerminalNum, err error) {
 // BaseRefreshEdbInfo
 // @Description: 刷新配置的基础指标信息结构体
 type BaseRefreshEdbInfo struct {
+	EdbInfoId       int
+	ClassifyId      int       `description:"钢联化工指标分类id"`
+	IndexCode       string    `description:"指标编码"`
+	IndexName       string    `description:"指标名称"`
+	EndDate         time.Time `description:"最新日期"`
+	EndValue        string    `description:"最新值"`
+	SysUserId       int       `description:"创建人id"`
+	SysUserRealName string    `description:"创建人姓名"`
+	Frequency       string    `description:"频度"`
+	IsStop          int       `description:"是否停更:1:停更,0:未停更"`
+	TerminalCode    string    `description:"终端编码"`
+	RefreshTime     string    `description:"刷新时间"`
+}
+
+// BaseRefreshEdbInfoItem
+// @Description: 刷新配置的基础指标信息结构体
+type BaseRefreshEdbInfoItem struct {
 	EdbInfoId       int
 	ClassifyId      int    `description:"钢联化工指标分类id"`
 	IndexCode       string `description:"指标编码"`
@@ -526,7 +543,7 @@ type BaseRefreshEdbInfo struct {
 // @Description: 刷新数据源的数据返回
 type RefreshBaseEdbInfoResp struct {
 	Paging *paging.PagingItem
-	List   []*BaseRefreshEdbInfo
+	List   []*BaseRefreshEdbInfoItem
 }
 
 // GetMysteelChemicalBaseInfoList

+ 22 - 3
services/data/edb_info_refresh.go

@@ -321,7 +321,7 @@ func SaveEdbRefreshConfig(source, subSource int, classifyId, terminalCode, frequ
 // @return err error
 // @return errMsg string
 // @return isSendEmail bool
-func HandleRefreshTime(source, subSource int, list []*data_manage.BaseRefreshEdbInfo) (newList []*data_manage.BaseRefreshEdbInfo, err error, errMsg string, isSendEmail bool) {
+func HandleRefreshTime(source, subSource int, list []*data_manage.BaseRefreshEdbInfoItem) (newList []*data_manage.BaseRefreshEdbInfoItem, err error, errMsg string, isSendEmail bool) {
 	isSendEmail = true
 	errMsg = "获取失败"
 	newList = list
@@ -411,11 +411,30 @@ func HandleRefreshTime(source, subSource int, list []*data_manage.BaseRefreshEdb
 // @return total int
 // @return list []*data_manage.BaseRefreshEdbInfo
 // @return err error
-func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequency, keyword, status string, startSize, pageSize int, sortParam, sortType string) (total int, list []*data_manage.BaseRefreshEdbInfo, err error) {
+func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequency, keyword, status string, startSize, pageSize int, sortParam, sortType string) (total int, listResp []*data_manage.BaseRefreshEdbInfoItem, err error) {
 	var pars []interface{}
 	var condition string
 
-	list = make([]*data_manage.BaseRefreshEdbInfo, 0)
+	listResp = make([]*data_manage.BaseRefreshEdbInfoItem, 0)
+	list := make([]*data_manage.BaseRefreshEdbInfo, 0)
+	defer func() {
+		for _, v := range list {
+			listResp = append(listResp, &data_manage.BaseRefreshEdbInfoItem{
+				EdbInfoId:       v.EdbInfoId,
+				ClassifyId:      v.ClassifyId,
+				IndexCode:       v.IndexCode,
+				IndexName:       v.IndexName,
+				EndDate:         v.EndDate.Format(utils.FormatDate),
+				EndValue:        v.EndValue,
+				SysUserId:       v.SysUserId,
+				SysUserRealName: v.SysUserRealName,
+				Frequency:       v.Frequency,
+				IsStop:          v.IsStop,
+				TerminalCode:    v.TerminalCode,
+				RefreshTime:     v.RefreshTime,
+			})
+		}
+	}()
 
 	isStop := -1
 	if status == `暂停` {