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-19 18:21:12 +08:00
parent c5f4a5d281
commit 83a2d64ee6
10 changed files with 191 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/model/work_repair.go
View File

@ -18,6 +18,7 @@ type WorkRepairInfo struct {
EquipmentTitle string `json:"equipment_title"`
Priority int `json:"priority"`
BreakdownTitle string `json:"breakdown_title"`
Username string `json:"username"`
}
type WorkRepairEvaluateInfo struct {
@ -29,9 +30,11 @@ func (m *WorkRepair) Repairs(page, pageSize int, count *int64, where ...*model.M
db := orm.GetDB().Table(m.TableName()+" r").
Select("r.id", "r.order_no", "e.code AS equipment_code", "e.title AS equipment_title", "w.priority",
"(SELECT GROUP_CONCAT(s_b.title) FROM (SELECT id, title FROM sys_breakdown) AS s_b WHERE FIND_IN_SET(s_b.id, w.breakdown)) AS breakdown_title",
"r.created_at").
"r.is_evaluate", "r.evaluate_score", "r.status", "u.name AS username", "r.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS w ON r.work_id = w.id", model.NewWorkInstance().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName()))
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS u ON w.uid = u.uuid", model.NewSysUser().TableName())).
Where("r.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, wo := range where {

35
app/model/work_schedule.go
View File

@ -18,9 +18,8 @@ type WorkSchedules struct {
// WorkScheduleInfo 工单流程信息
type WorkScheduleInfo struct {
ID uint64 `json:"id"`
IsNextStage bool `json:"is_next_stage"` // 下一步骤
Reviewer []string `json:"reviewer"`
ID uint64 `json:"id"`
Reviewer []string `json:"reviewer"`
}
// ValidateAuth 验证权限
@ -70,6 +69,22 @@ func (m *WorkSchedule) FirstSchedule(kind model.WorkScheduleKind) (bool, error)
return true, nil
}
// LastSchedule 上一流程信息
func (m *WorkSchedule) LastSchedule() (*WorkScheduleInfo, error) {
mLastWorkSchedule := model.NewWorkSchedule()
isExist, err := model.FirstField(mLastWorkSchedule, []string{"id", "stage", "step"},
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 nil, nil
}
return &WorkScheduleInfo{ID: mLastWorkSchedule.ID, Reviewer: mLastWorkSchedule.GetTargetValueAttribute()}, err
}
// NextSchedule 下一流程
func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
nextWorkSchedule := model.NewWorkSchedule()
@ -80,7 +95,7 @@ func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
if err != nil {
return nil, err
} else if isExist { // 直接抛出当前阶段下一流程信息
return &WorkScheduleInfo{ID: nextWorkSchedule.ID, Reviewer: nextWorkSchedule.GetTargetValueAttribute()}, err
goto RETURN
}
// 进入下一阶段
// 是否需要下一阶段协助
@ -99,7 +114,17 @@ func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
}
return nil, err
}
return &WorkScheduleInfo{ID: nextWorkSchedule.ID, IsNextStage: true, Reviewer: nextWorkSchedule.GetTargetValueAttribute()}, err
RETURN:
//var count int64
//// 判断是否当前阶段第一个元素
//if err = orm.GetDB().Table(nextWorkSchedule.TableName()).
// Where("kind = ? AND is_deleted = ?", nextWorkSchedule.Kind, model.DeleteStatusForNot).
// Where("stage = ?", nextWorkSchedule.Stage).
// Where("step < ?", nextWorkSchedule.Step).
// Count(&count).Error; err != nil {
// return nil, err
//}
return &WorkScheduleInfo{ID: nextWorkSchedule.ID, Reviewer: nextWorkSchedule.GetTargetValueAttribute()}, err
}
// Schedules 流程信息