From 17dba6007bd78e1226c54808062039f0bca3f68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 17 Dec 2020 17:39:19 +0800
Subject: [PATCH] a

---
 business/jxstore/cms/job.go   | 21 +++++++++++++++------
 controllers/job_controller.go |  3 ++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 27c28f1da..762a78cfa 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -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
+				}
 			}
 		}
 	}
diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index 94ad37f0d..7ae146413 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -422,6 +422,7 @@ func (c *JobController) CreateJobSpan() {
 // @Description 置顶任务重排序
 // @Param	token			header		string		true	"认证token"
 // @Param	jobIDs			formData	string		true	"任务IDs（按顺序）"
+// @Param	span			formData	int			true	"标签，1为置顶，2为推荐"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /ReloadJobSpan [post]
@@ -431,7 +432,7 @@ func (c *JobController) ReloadJobSpan() {
 			jobIDs []int
 		)
 		if err = jxutils.Strings2Objs(params.JobIDs, &jobIDs); err == nil {
-			err = cms.ReloadJobSpan(params.Ctx, jobIDs)
+			err = cms.ReloadJobSpan(params.Ctx, jobIDs, params.Span)
 		}
 		return retVal, "", err
 	})