liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
苏尹岚
2020-12-17 17:39:19 +08:00
parent 1f3164832d
commit 17dba6007b
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
business/jxstore/cms/job.go
View File

@@ -1148,11 +1148,11 @@ func RefreshJobSpan(ctx *jxcontext.Context) (err error) {
return err
}
func ReloadJobSpan(ctx *jxcontext.Context, jobIDs []int) (err error) {
func ReloadJobSpan(ctx *jxcontext.Context, jobIDs []int, span int) (err error) {
var (
db = dao.GetDB()
)
jobs, err := dao.GetJobsNoPage(db, nil, nil, []int{model.JobStatusDoing}, nil, utils.ZeroTimeValue, utils.ZeroTimeValue, model.JobSpanTop, false)
jobs, err := dao.GetJobsNoPage(db, nil, nil, []int{model.JobStatusDoing}, nil, utils.ZeroTimeValue, utils.ZeroTimeValue, span, false)
if len(jobs) != len(jobIDs) {
return fmt.Errorf("传入的任务IDs有误！")
}
@@ -1160,11 +1160,20 @@ func ReloadJobSpan(ctx *jxcontext.Context, jobIDs []int) (err error) {
job := &model.Job{}
job.ID = v
if err = dao.GetEntity(db, job); err == nil {
if job.JobSpanTop == model.JobSpanTop {
job.TopSeq = k + 1
dao.UpdateEntity(db, job, "TopSeq")
if span == model.JobSpanTop {
if job.JobSpanTop == model.JobSpanTop {
job.TopSeq = k + 1
dao.UpdateEntity(db, job, "TopSeq")
} else {
continue
}
} else {
continue
if job.JobSpanRecmd == 1 {
job.RecmdSeq = k + 1
dao.UpdateEntity(db, job, "RecmdSeq")
} else {
continue
}
}
}
}