Skip to content

Commit

Permalink
1.修复重新提交工单后 流程错乱的问题 2.修复打开工单详情页大量发送无效请求的问题 3.修复工单详情看不到具体执行sql的问题 4.修复…
Browse files Browse the repository at this point in the history
…语句执行失败后文案描述异常问题
  • Loading branch information
cookieY committed Sep 25, 2020
1 parent 4d8fb01 commit 106bad6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/handle/commom/expr.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/jinzhu/gorm"
)

const QueryField = "work_id, username, text, backup, date, real_name, executor, `status`, `type`, `delay`, `source`,`id_c`,`data_base`,`table`,`execute_time`,assigned,current_step"
const QueryField = "work_id, username, text, backup, date, real_name, executor, `status`, `type`, `delay`, `source`,`id_c`,`data_base`,`table`,`execute_time`,assigned,current_step,relevant"

func AccordingToWorkId(workId string) func(db *gorm.DB) *gorm.DB {
return func(db *gorm.DB) *gorm.DB {
Expand Down
31 changes: 16 additions & 15 deletions src/handle/manage/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ type ber struct {
Date string `json:"date"`
}


type mt struct {
Mail model.Message
}
Expand Down Expand Up @@ -82,7 +81,7 @@ func SuperTestSetting(c yee.Context) (err error) {
c.Logger().Error(err.Error())
return c.JSON(http.StatusInternalServerError, err.Error())
}
go lib.SendMail( u.Mail, lib.TemoplateTestMail)
go lib.SendMail(u.Mail, lib.TemoplateTestMail)
return c.JSON(http.StatusOK, "测试邮件已发送!请注意查收!")
}

Expand All @@ -92,7 +91,7 @@ func SuperTestSetting(c yee.Context) (err error) {
c.Logger().Error(err.Error())
return c.JSON(http.StatusInternalServerError, err.Error())
}
go lib.SendDingMsg( u.Mail, lib.TmplTestDing)
go lib.SendDingMsg(u.Mail, lib.TmplTestDing)
return c.JSON(http.StatusOK, "测试消息已发送!请注意查收!")
}

Expand All @@ -114,7 +113,7 @@ func SuperTestSetting(c yee.Context) (err error) {
return c.JSON(http.StatusInternalServerError, "未知传参!")
}

func SuperSaveRoles(c yee.Context) (err error) {
func SuperSaveRoles(c yee.Context) (err error) {

u := new(set)

Expand All @@ -136,7 +135,7 @@ func DelQueryOrder(c yee.Context) (err error) {
return c.JSON(http.StatusOK, err.Error())
}
var order []model.CoreQueryOrder
model.DB().Where("`date` < ?",u.Date).Find(&order)
model.DB().Where("`date` < ?", u.Date).Find(&order)

tx := model.DB().Begin()
for _, i := range order {
Expand All @@ -155,14 +154,16 @@ func UndoAuditOrder(c yee.Context) (err error) {
c.Logger().Error(err.Error())
return
}
var order []model.CoreSqlOrder
model.DB().Where("`date` < ?",u.Date).Find(&order)
tx := model.DB().Begin()
for _, i := range order {
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreSqlOrder{})
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreRollback{})
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreSqlRecord{})
}
tx.Commit()
go func() {
var order []model.CoreSqlOrder
model.DB().Where("`date` < ?", u.Date).Find(&order)
tx := model.DB().Begin()
for _, i := range order {
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreSqlOrder{})
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreRollback{})
tx.Where("work_id =?", i.WorkId).Delete(&model.CoreSqlRecord{})
}
tx.Commit()
}()
return c.JSON(http.StatusOK, "工单已删除!")
}
}
2 changes: 1 addition & 1 deletion src/handle/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func SuperUserEdit(c yee.Context) (err error) {
switch u.Tp {
case "info":
tx := model.DB().Begin()
tx.Model(model.CoreAccount{}).Where("username = ?", u.Username).Updates(model.CoreAccount{Email: u.Mail, RealName: u.RealName, Department: u.Department})
tx.Model(model.CoreAccount{}).Where("username = ?", u.Username).Updates(model.CoreAccount{Email: u.Mail, RealName: u.RealName, Department: u.Department, Rule: u.Rule})
tx.Model(model.CoreSqlOrder{}).Where("username =?", u.Username).Update(model.CoreSqlOrder{RealName: u.RealName})
tx.Model(model.CoreQueryOrder{}).Where("username =?", u.Username).Update(model.CoreQueryOrder{Realname: u.RealName})
tx.Commit()
Expand Down

0 comments on commit 106bad6

Please sign in to comment.