feat：完善项目

app/model/manage_material.go

@@ -43,10 +43,10 @@ func (m *ManageMaterial) Materials(page, pageSize int, count *int64, where ...*m
 	}
 	out := make([]*ManageMaterialInfo, 0)
 
-	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+	if err := db.Count(count).Error; err != nil {
 		return nil, err
 	}
-	if err := db.Count(count).Error; err != nil {
+	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
 		return nil, err
 	}
 	return out, nil

app/model/manage_materiral_purchase.go

@@ -33,10 +33,10 @@ func (m *ManageMaterialPurchase) Purchases(page, pageSize int, count *int64, whe
 	}
 	out := make([]*ManageMaterialPurchaseInfo, 0)
 
-	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+	if err := db.Count(count).Error; err != nil {
 		return nil, err
 	}
-	if err := db.Count(count).Error; err != nil {
+	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
 		return nil, err
 	}
 	return out, nil

app/model/sys_user.go

@@ -58,10 +58,10 @@ func (m *SysUser) Users(page, pageSize int, count *int64, where ...*model.ModelW
 			db = db.Where(wo.Condition, wo.Value)
 		}
 	}
-	if err := db.Order("u.id " + model.OrderModeToAsc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+	if err := db.Count(count).Error; err != nil {
 		return nil, err
 	}
-	if err := db.Count(count).Error; err != nil {
+	if err := db.Order("u.id " + model.OrderModeToAsc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
 		return nil, err
 	}
 	return out, nil

app/model/work_instance.go

@@ -40,10 +40,10 @@ func (m *WorkInstance) Instances(page, pageSize int, count *int64, where ...*mod
 	}
 	out := make([]*WorkInstanceInfo, 0)
 
-	if err := db.Order("w.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+	if err := orm.GetDB().Table(m.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot).Count(count).Error; err != nil {
 		return nil, err
 	}
-	if err := db.Count(count).Error; err != nil {
+	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

app/model/work_progress.go

@@ -0,0 +1,11 @@
+package model
+
+import "ArmedPolice/app/common/model"
+
+type WorkProgress struct {
+	*model.WorkProgress
+}
+
+func NewWorkProgress() *WorkProgress {
+	return &WorkProgress{model.NewWorkProgress()}
+}

app/model/work_schedule.go

@@ -0,0 +1,55 @@
+package model
+
+import (
+	"ArmedPolice/app/common/model"
+	"fmt"
+)
+
+type WorkSchedule struct {
+	*model.WorkSchedule
+}
+
+// WorkScheduleInfo 工单流程信息
+type WorkScheduleInfo struct {
+	ID       uint64   `json:"id"`
+	Reviewer []uint64 `json:"reviewer"`
+}
+
+// ValidateAuth 验证权限
+func (m *WorkSchedule) ValidateAuth(uid uint64) (bool, error) {
+	// 流程权限信息
+	auths := make(map[string]bool, 0)
+
+	for _, v := range m.GetTargetValueAttribute() {
+		auths[v] = true
+	}
+	// 触发审核对象
+	switch m.Target {
+	case model.WorkScheduleTargetForPerson: // 个人
+		_, has := auths[fmt.Sprintf("%d", uid)]
+		return has, nil
+	case model.WorkScheduleTargetForRole: // 角色
+		// 查询角色信息
+		roleIDs := make([]uint64, 0)
+		mSysUserRole := model.NewSysUserRole()
+
+		if err := model.Pluck(mSysUserRole, "role_id", &roleIDs, model.NewWhere("uid", uid)); err != nil {
+			return false, err
+		}
+		for _, v := range roleIDs {
+			if _, has := auths[fmt.Sprintf("%d", v)]; has {
+				return has, nil
+			}
+		}
+		break
+	}
+	return false, nil
+}
+
+func (m *WorkSchedule) NextSchedule() (*WorkScheduleInfo, error) {
+	return nil, nil
+}
+
+func NewWorkSchedule() *WorkSchedule {
+	return &WorkSchedule{model.NewWorkSchedule()}
+}