daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-09 14:08:02 +08:00
parent 08083d26d3
commit d544b7f80c
14 changed files with 338 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/model/work_schedule.go
View File

@ -13,9 +13,9 @@ type WorkSchedule struct {
// WorkScheduleInfo 工单流程信息
type WorkScheduleInfo struct {
ID uint64 `json:"id"`
IsNext bool `json:"is_next"`
Reviewer []string `json:"reviewer"`
ID uint64 `json:"id"`
IsNextStage bool `json:"is_next_stage"` // 下一步骤
Reviewer []string `json:"reviewer"`
}
// ValidateAuth 验证权限
@ -50,8 +50,9 @@ func (m *WorkSchedule) ValidateAuth(uid uint64) (bool, error) {
}
// FirstSchedule 第一个流程
func (m *WorkSchedule) FirstSchedule() (bool, error) {
func (m *WorkSchedule) FirstSchedule(kind model.WorkScheduleKind) (bool, error) {
db := orm.GetDB().Table(m.TableName()).Select("id", "title", "stage", "step").
Where("kind = ?", kind).
Where("is_deleted = ?", model.DeleteStatusForNot).
Order("stage " + model.OrderModeToAsc).Order("step " + model.OrderModeToAsc)
@ -66,15 +67,15 @@ func (m *WorkSchedule) FirstSchedule() (bool, error) {
// NextSchedule 下一流程
func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
next := NewWorkSchedule()
nextWorkSchedule := model.NewWorkSchedule()
isExist, err := model.FirstWhere(next.WorkSchedule, model.NewWhere("stage", m.Stage),
model.NewWhere("step", m.Stage+1))
isExist, err := model.FirstWhere(nextWorkSchedule, model.NewWhere("kind", m.Kind),
model.NewWhere("stage", m.Stage), model.NewWhereCondition("step", ">", m.Step))
if err != nil {
return nil, err
} else if isExist { // 直接抛出当前阶段下一流程信息
return &WorkScheduleInfo{ID: next.ID, Reviewer: next.GetTargetValueAttribute()}, err
return &WorkScheduleInfo{ID: nextWorkSchedule.ID, Reviewer: nextWorkSchedule.GetTargetValueAttribute()}, err
}
// 进入下一阶段
// 是否需要下一阶段协助
@ -83,13 +84,36 @@ func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
return nil, nil
}
// 下一阶段第一流程信息
if isExist, err = model.FirstWhere(next.WorkSchedule, model.NewWhere("stage", m.Stage+1),
model.NewWhere("step", 1)); err != nil {
if err = orm.GetDB().Table(nextWorkSchedule.TableName()).
Where("kind = ? AND is_deleted = ?", m.Kind, model.DeleteStatusForNot).
Where("stage > ?", m.Stage).
Order("stage " + model.OrderModeToAsc).Order("step " + model.OrderModeToAsc).
First(nextWorkSchedule).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, nil
}
return nil, err
} else if !isExist {
return nil, nil
}
return &WorkScheduleInfo{ID: next.ID, IsNext: true, Reviewer: next.GetTargetValueAttribute()}, err
return &WorkScheduleInfo{ID: nextWorkSchedule.ID, IsNextStage: true, Reviewer: nextWorkSchedule.GetTargetValueAttribute()}, err
}
// Schedules 流程信息
func (m *WorkSchedule) Schedules() ([]*model.WorkSchedule, error) {
sql := `SELECT s.id, s.kind, s.title, s.stage, s.step, s.target,
CASE s.target
WHEN 1 THEN
(SELECT GROUP_CONCAT(u_d.name) FROM ( SELECT u.uuid, u.name FROM %s AS u WHERE u.is_deleted = %d) AS u_d WHERE FIND_IN_SET( u_d.uuid, s.target_value ))
WHEN 2 THEN
(SELECT GROUP_CONCAT(r_d.name) FROM (SELECT r.id, r.name FROM %s AS r WHERE r.is_deleted = %d) AS r_d WHERE FIND_IN_SET( r_d.id, s.target_value ))
ELSE ""
END AS target_value, s.is_countersign, s.created_at
FROM %s AS s WHERE s.is_deleted = %d ORDER BY s.kind ASC, s.stage ASC, s.step ASC`
out := make([]*model.WorkSchedule, 0)
err := orm.GetDB().Raw(fmt.Sprintf(sql, model.NewSysUser().TableName(), model.DeleteStatusForNot,
model.NewSysRole().TableName(), model.DeleteStatusForNot, m.TableName(), model.DeleteStatusForNot)).Scan(&out).Error
return out, err
}
func NewWorkSchedule() *WorkSchedule {