feat：完善项目

app/model/manage_equipment_material.go

@@ -19,7 +19,7 @@ func (m *ManageEquipmentMaterial) Materials(equipmentID uint64) ([]*ManageEquipm
 	db := orm.GetDB().Table(m.TableName()+" AS e").
 		Select("e.id", "m.code", "m.title", "m.unit", "s.name AS manufacturer_name").
 		Joins(fmt.Sprintf("LEFT JOIN %s AS m ON e.material_id = m.id", model.NewManageMaterial().TableName())).
-		Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m.supplier_id = s.id", model.NewManageSupplier().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m.manufacturer_id = s.id", model.NewManageSupplier().TableName())).
 		Where("e.equipment_id = ? AND e.is_deleted = ?", equipmentID, model.DeleteStatusForNot)
 
 	out := make([]*ManageEquipmentMaterialInfo, 0)

app/model/sys_menu.go

@@ -20,8 +20,7 @@ type SysMenuScene struct {
 func (m *SysMenu) Menus() ([]*model.SysMenu, error) {
 	out := make([]*model.SysMenu, 0)
 
-	db := orm.GetDB().Table(m.TableName()).
-		Where("status = ? AND is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot)
+	db := orm.GetDB().Table(m.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot)
 
 	if err := db.Order("parent_id " + model.OrderModeToAsc).Order("sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
 		return nil, err

app/model/work_instance.go

@@ -49,6 +49,41 @@ func (m *WorkInstance) Instances(page, pageSize int, count *int64, where ...*mod
 	return out, nil
 }
 
+// Persons 个人信息
+func (m *WorkInstance) Persons(uid uint64, kind model.WorkScheduleKind, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*WorkInstanceInfo, error) {
+	mWorkProgress := model.NewWorkProgress()
+
+	mWorkSchedule := model.NewWorkSchedule()
+
+	db := orm.GetDB().Table(model.NewWorkProgress().TableName()+" AS p").
+		Select("w.id", "w.title", "e.code AS equipment_code", "e.title AS equipment_title", "w.priority",
+			"GROUP_CONCAT(b.title) AS breakdown_title", "w.status", "w.created_at").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS w ON p.work_id = w.id", m.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 b ON FIND_IN_SET(b.id, w.breakdown)", model.NewSysBreakdown().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN (SELECT id FROM %s WHERE kind = %d ORDER BY stage ASC, step ASC limit 1) AS s ON p.schedule_id = s.id",
+			mWorkSchedule.TableName(), kind)).
+		Where("p.is_deleted = ? AND w.is_deleted = ?", model.DeleteStatusForNot, model.DeleteStatusForNot).
+		Where("p.uid = ?", uid).
+		Where("s.id > ?", 0).
+		Group("w.id")
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*WorkInstanceInfo, 0)
+
+	if err := orm.GetDB().Table(mWorkProgress.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot).Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("w.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func NewWorkInstance() *WorkInstance {
 	return &WorkInstance{model.NewWorkInstance()}
 }

app/model/work_schedule.go

@@ -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 {