From c798070d12a77c1074cfcd234225b9b175e3c189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 28 Dec 2020 11:19:13 +0800 Subject: [PATCH] aa --- business/jxstore/cms/job.go | 24 ++++++++++++++++++++++-- routers/commentsRouter_controllers.go | 9 +++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index a450fec3c..fc883c1e5 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -1490,8 +1490,7 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro db = dao.GetDB() job = &model.Job{} ) - job.ID = payload["id"].(int) - err = dao.GetEntity(db, job) + utils.Map2StructByJson(payload, &job, false) valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName()) if len(valid) > 0 { dao.Begin(db) @@ -1505,6 +1504,27 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro dao.Rollback(db) return err } + if len(job.JobSteps) > 0 { + steps, _ := dao.GetJobSteps(db, job.ID) + for _, v := range steps { + v.DeletedAt = time.Now() + dao.UpdateEntity(db, v, "DeletedAt") + } + if err = dao.CreateMultiEntities(db, job.JobSteps); err != nil { + dao.Rollback(db) + return err + } + } + if len(job.JobImgs) > 0 { + imgs, _ := dao.GetJobImgs(db, job.ID) + for _, v := range imgs { + dao.DeleteEntity(db, v) + } + if err = dao.CreateMultiEntities(db, job.JobImgs); err != nil { + dao.Rollback(db) + return err + } + } dao.Commit(db) } return err diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 9d70ce246..4913ccd73 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -565,6 +565,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"], + beego.ControllerComments{ + Method: "UpdateJob", + Router: `/UpdateJob`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"], beego.ControllerComments{ Method: "UserRefundEjy",