|
@@ -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 == `暂停` {
|