aa
This commit is contained in:
@@ -1490,8 +1490,7 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
|
|||||||
db = dao.GetDB()
|
db = dao.GetDB()
|
||||||
job = &model.Job{}
|
job = &model.Job{}
|
||||||
)
|
)
|
||||||
job.ID = payload["id"].(int)
|
utils.Map2StructByJson(payload, &job, false)
|
||||||
err = dao.GetEntity(db, job)
|
|
||||||
valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName())
|
valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName())
|
||||||
if len(valid) > 0 {
|
if len(valid) > 0 {
|
||||||
dao.Begin(db)
|
dao.Begin(db)
|
||||||
@@ -1505,6 +1504,27 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
|
|||||||
dao.Rollback(db)
|
dao.Rollback(db)
|
||||||
return err
|
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)
|
dao.Commit(db)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -565,6 +565,15 @@ func init() {
|
|||||||
Filters: nil,
|
Filters: nil,
|
||||||
Params: 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.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"],
|
||||||
beego.ControllerComments{
|
beego.ControllerComments{
|
||||||
Method: "UserRefundEjy",
|
Method: "UserRefundEjy",
|
||||||
|
|||||||
Reference in New Issue
Block a user