feat：完善项目

app/api/work.go

@@ -33,6 +33,15 @@ type (
 		Mobile  string `json:"mobile" form:"mobile" binding:"required"`   // 联系方式
 		Address string `json:"address" form:"address" binding:"required"` // 联系地址
 	}
+	// scheduleForm 流程信息
+	scheduleForm struct {
+		Title         string   `json:"title" form:"title" binding:"required"`
+		Stage         int      `json:"stage" form:"stage"`
+		Step          int      `json:"step" form:"step"`
+		Target        int      `json:"target" form:"target" binding:"required"`
+		TargetValue   []string `json:"target_value" form:"target_value" binding:"required"`
+		IsCountersign int      `json:"is_countersign" form:"is_countersign"`
+	}
 )
 
 /**
@@ -49,17 +58,18 @@ type (
 * @apiParam {Number} current 当前页
 * @apiParam {Number} page_size 页展示数
 *
-* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {Object} data 数据信息
-* @apiSuccess (200) {String} msg 成功提示
-* @apiSuccess (200) {Array} data 数据信息
 * @apiSuccess (200) {String} data.id ID
 * @apiSuccess (200) {String} data.title 标题名称
 * @apiSuccess (200) {String} data.material_code 装备编码
 * @apiSuccess (200) {String} data.material_title 装备名称
 * @apiSuccess (200) {String} data.breakdown_title 故障信息
+* @apiSuccess (200) {String} data.schedule_title 流程名称
 * @apiSuccess (200) {Number} data.priority 紧急状态（1：普通，2：紧急，3：非常紧急）
 * @apiSuccess (200) {Number} data.status 状态（0：进行中，1：已完成）
 * @apiSuccess (200) {Time} data.created_at 创建时间
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
 *
 * @apiSuccessExample {json} Success response:
 *     HTTPS 200 OK
@@ -73,6 +83,7 @@ type (
 *				"material_code": "装备编码",
 *				"material_title": "装备名称",
 *				"breakdown_title": "发动机,刹车盘",
+*				"schedule_title": "分管领导审批",
 *				"priority": 1,
 *				"status": 0,
 *				"created_at": "2021-11-05T14:24:07+08:00",
@@ -108,17 +119,18 @@ func (*Work) Instance(c *gin.Context) {
 * @apiParam {Number} current 当前页
 * @apiParam {Number} page_size 页展示数
 *
-* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {Object} data 数据信息
-* @apiSuccess (200) {String} msg 成功提示
-* @apiSuccess (200) {Array} data 数据信息
 * @apiSuccess (200) {String} data.id ID
 * @apiSuccess (200) {String} data.title 标题名称
 * @apiSuccess (200) {String} data.material_code 装备编码
 * @apiSuccess (200) {String} data.material_title 装备名称
 * @apiSuccess (200) {String} data.breakdown_title 故障信息
+* @apiSuccess (200) {String} data.schedule_title 流程名称
 * @apiSuccess (200) {Number} data.priority 紧急状态（1：普通，2：紧急，3：非常紧急）
 * @apiSuccess (200) {Number} data.status 状态（0：进行中，1：已完成）
 * @apiSuccess (200) {Time} data.created_at 创建时间
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
 *
 * @apiSuccessExample {json} Success response:
 *     HTTPS 200 OK
@@ -132,6 +144,7 @@ func (*Work) Instance(c *gin.Context) {
 *				"material_code": "装备编码",
 *				"material_title": "装备名称",
 *				"breakdown_title": "发动机,刹车盘",
+*				"schedule_title": "分管领导审批",
 *				"priority": 1,
 *				"status": 0,
 *				"created_at": "2021-11-05T14:24:07+08:00",
@@ -153,6 +166,53 @@ func (*Work) Person(c *gin.Context) {
 	APIResponse(err, data)(c)
 }
 
+/**
+* @api {post} /api/v1/work/workbench 个人待办事项
+* @apiVersion 1.0.0
+* @apiName WorkWorkbench
+* @apiGroup Work
+*
+* @apiHeader {string} x-token token
+* @apiHeader {string} Content-Type=application/json 传输方式
+*
+* @apiParam {String} [material_id=0] 装备ID
+* @apiParam {String} [kind=0] 工单类型
+* @apiParam {Number} current 当前页
+* @apiParam {Number} page_size 页展示数
+*
+* @apiSuccess (200) {Object} data 数据信息
+* @apiSuccess (200) {String} data.id ID
+* @apiSuccess (200) {String} data.title 标题名称
+* @apiSuccess (200) {String} data.material_code 装备编码
+* @apiSuccess (200) {String} data.material_title 装备名称
+* @apiSuccess (200) {String} data.breakdown_title 故障信息
+* @apiSuccess (200) {String} data.schedule_title 流程名称
+* @apiSuccess (200) {Number} data.priority 紧急状态（1：普通，2：紧急，3：非常紧急）
+* @apiSuccess (200) {Number} data.status 状态（0：进行中，1：已完成）
+* @apiSuccess (200) {Time} data.created_at 创建时间
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
+*
+* @apiSuccessExample {json} Success response:
+*     HTTPS 200 OK
+*     {
+*     	"code": 200
+*		"msg": "ok"
+*		"data": [
+*			{
+*				"id": "m9Qa2ZaOvE",
+*				"title": "刹车盘",
+*				"material_code": "装备编码",
+*				"material_title": "装备名称",
+*				"breakdown_title": "发动机,刹车盘",
+*				"schedule_title": "分管领导审批",
+*				"priority": 1,
+*				"status": 0,
+*				"created_at": "2021-11-05T14:24:07+08:00",
+*			}
+*		]
+*     }
+ */
 func (*Work) Workbench(c *gin.Context) {
 	form := &struct {
 		MaterialID uint64 `json:"material_id" form:"material_id"`
@@ -221,7 +281,131 @@ func (*Work) Delete(c *gin.Context) {
 	APIResponse(err)(c)
 }
 
+/**
+* @api {get} /api/v1/work/schedule 工单流程信息
+* @apiVersion 1.0.0
+* @apiName WorkSchedule
+* @apiGroup Work
+*
+* @apiHeader {string} x-token token
+*
+* @apiSuccess (200) {Object} data 数据信息
+* @apiSuccess (200) {Number} data.kind 流程类型（1；维修工单）
+* @apiSuccess (200) {String} data.title 流程名称
+* @apiSuccess (200) {Object} data.schedules 流程信息
+* @apiSuccess (200) {String} data.schedules.id 流程详细ID
+* @apiSuccess (200) {String} data.schedules.title 流程详细名称
+* @apiSuccess (200) {Number} data.schedules.stage 阶段
+* @apiSuccess (200) {Number} data.schedules.step 步骤
+* @apiSuccess (200) {Number} data.schedules.target 触发对象（1：个人，2：角色）
+* @apiSuccess (200) {String} data.schedules.target_value 触发对象信息
+* @apiSuccess (200) {String} data.schedules.target_value_title 触发对象具体信息
+* @apiSuccess (200) {Number} data.schedules.is_countersign 是否会签（0：否，1：是）暂不需要此字段
+* @apiSuccess (200) {Time} data.schedules.created_at 创建时间
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
+*
+* @apiSuccessExample {json} Success response:
+*     HTTPS 200 OK
+*     {
+*     	"code": 200
+*		"msg": "ok"
+*		"data": [
+*			{
+*				"kind": "m9Qa2ZaOvE",
+*				"title": "刹车盘",
+*				"schedules": [
+*					{
+*						"id": "A9GVg5JZdr",
+*						"title": "发起工单",
+*						"stage": 1,
+*						"step": 2,
+*						"target": 2,
+*						"target_value": "9",
+*						"target_value_title": "区域修理队",
+*						"is_countersign": 0,
+*						"created_at": "2021-11-05T14:24:07+08:00",
+*					]
+*				}
+*			}
+*		]
+*     }
+ */
 func (*Work) Schedule(c *gin.Context) {
 	data, err := work.NewSchedule()(getSession()(c).(*service.Session)).List()
 	APIResponse(err, data)(c)
 }
+
+/**
+* @api {get} /api/v1/work/schedule/edit 工单流程信息修改
+* @apiVersion 1.0.0
+* @apiName WorkSchedulEdit
+* @apiGroup Work
+*
+* @apiHeader {string} x-token token
+*
+* @apiParam {String} id Id
+* @apiParam {String} title 名称
+* @apiParam {Number} target 触发对象
+* @apiParam {Array.String} target_value 触发对象具体信息
+*
+* @apiSuccess (200) {Object} data 数据信息
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
+*
+* @apiSuccessExample {json} Success response:
+*     HTTPS 200 OK
+*     {
+*     	"code": 200
+*		"msg": "ok"
+*		"data": null
+*     }
+ */
+func (*Work) ScheduleEdit(c *gin.Context) {
+	form := &struct {
+		IDStringForm
+		scheduleForm
+	}{}
+	if err := bind(form)(c); err != nil {
+		APIFailure(err.(error))(c)
+		return
+	}
+	err := work.NewSchedule()(getSession()(c).(*service.Session)).Form(&work.ScheduleParams{
+		ID: form.Convert(), Title: form.Title, Stage: form.Stage, Step: form.Step,
+		Target: form.Target, IsCountersign: form.IsCountersign, TargetValue: form.TargetValue,
+	})
+	APIResponse(err)(c)
+}
+
+/**
+* @api {get} /api/v1/work/schedule/delete 工单流程信息删除
+* @apiVersion 1.0.0
+* @apiName WorkSchedulDelete
+* @apiGroup Work
+*
+* @apiHeader {string} x-token token
+*
+* @apiParam {String} id Id
+*
+* @apiSuccess (200) {Object} data 数据信息
+* @apiSuccess (200) {Number} code 成功响应状态码!
+* @apiSuccess (200) {String} msg 成功提示
+*
+* @apiSuccessExample {json} Success response:
+*     HTTPS 200 OK
+*     {
+*     	"code": 200
+*		"msg": "ok"
+*		"data": null
+*     }
+ */
+func (*Work) ScheduleDelete(c *gin.Context) {
+	form := new(IDStringForm)
+
+	if err := bind(form)(c); err != nil {
+		APIFailure(err.(error))(c)
+		return
+	}
+	err := work.NewSchedule()(getSession()(c).(*service.Session)).Delete(form.Convert())
+	APIResponse(err)(c)
+}

app/common/model/sys_role.go

@@ -3,6 +3,7 @@ package model
 // SysRole 角色管理数据模型
 type SysRole struct {
 	Model
+	ModelTenant
 	ParentID uint64 `gorm:"column:parent_id;type:int;default:0;comment:父级ID" json:"-"`
 	Name     string `gorm:"column:name;type:varchar(30);default:null;comment:角色名" json:"name"`
 	Remark   string `gorm:"column:remark;type:varchar(255);default:null;comment:角色备注" json:"remark"`

app/common/model/sys_role_auth.go

@@ -2,7 +2,6 @@ package model
 
 type SysRoleAuth struct {
 	Model
-	ModelTenant
 	RoleID uint64 `gorm:"column:role_id;type:int;default:0;comment:角色ID" json:"-"`
 	AuthID uint64 `gorm:"column:auth_id;type:int;default:0;comment:权限ID" json:"-"`
 	ModelDeleted

app/common/model/sys_role_menu.go

@@ -2,7 +2,6 @@ package model
 
 type SysRoleMenu struct {
 	Model
-	ModelTenant
 	RoleID uint64 `gorm:"column:role_id;type:int;default:0;comment:角色ID" json:"-"`
 	MenuID uint64 `gorm:"column:menu_id;type:int;default:0;comment:菜单ID" json:"-"`
 	ModelDeleted

app/common/model/sys_user_role.go

@@ -2,7 +2,6 @@ package model
 
 type SysUserRole struct {
 	Model
-	ModelTenant
 	UID    uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
 	RoleID uint64 `gorm:"column:role_id;type:int;default:0;comment:角色ID" json:"-"`
 	ModelDeleted

app/controller/role/menu.go

@@ -59,7 +59,7 @@ func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
 				continue
 			}
 			menus = append(menus, &model2.SysRoleMenu{
-				ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, MenuID: v,
+				RoleID: roleID, MenuID: v,
 			})
 			mark[v] = v
 		}

app/controller/work/instance.go

@@ -130,12 +130,31 @@ func (c *Instance) Workbench(materialID uint64, kind, page, pageSize int) (*basi
 	mSysUserRole := model.NewSysUserRole()
 	roleIDs := make([]string, 0)
 
-	err := model2.Pluck(mSysUserRole.SysUserRole, "id", &roleIDs, model2.NewWhere("uid", c.UID))
+	err := model2.Pluck(mSysUserRole.SysUserRole, "role_id", &roleIDs, model2.NewWhere("uid", c.UID))
 
 	if err != nil {
 		return nil, err
 	}
-	return nil, nil
+	mWorkInstance := model.NewWorkInstance()
+
+	where := make([]*model2.ModelWhere, 0)
+
+	if materialID > 0 {
+		where = append(where, model2.NewWhere("w.material_id", materialID))
+	}
+	if kind > 0 {
+		where = append(where, model2.NewWhere("w.kind", kind))
+	}
+	var count int64
+
+	out := make([]*model.WorkInstanceInfo, 0)
+
+	if out, err = mWorkInstance.Workbench(&model.WorkbenchCondition{
+		UID: c.UIDToString(), RoleIDs: roleIDs,
+	}, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	return &basic.PageDataResponse{Data: out, Count: count}, nil
 }
 
 func (c *Instance) Detail(id uint64) (interface{}, error) {
@@ -187,14 +206,16 @@ func (c *Instance) Launch(params *InstanceLaunchParams) error {
 		return errors.New("操作错误，无工单流程信息，请先核实数据")
 	}
 	mWorkInstance.Schedule = mWorkSchedule.ID
+	mWorkInstance.Status = model2.WorkInstanceStatusForComplete
 	// 下一流程
 	nextWorkSchedule := new(model.WorkScheduleInfo)
 
 	if nextWorkSchedule, err = mWorkSchedule.NextSchedule(mWorkInstance.IsAssist == model2.WorkInstanceAssistForYes); err != nil {
 		return err
 	}
-	if nextWorkSchedule == nil {
+	if nextWorkSchedule != nil {
-		mWorkInstance.Status = model2.WorkInstanceStatusForComplete
+		mWorkInstance.Status = model2.WorkInstanceStatusForOngoing
+		mWorkInstance.Schedule = nextWorkSchedule.ID
 	}
 	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
 		if err = model2.Create(mWorkInstance.WorkInstance, tx); err != nil {
@@ -240,7 +261,7 @@ func (c *Instance) Examine(id uint64, status int, remark string, isAssist int) e
 	mWorkSchedule := model.NewWorkSchedule()
 	mWorkSchedule.ID = mWorkInstance.Schedule
 
-	if isExist, err = model2.First(mWorkSchedule); err != nil {
+	if isExist, err = model2.First(mWorkSchedule.WorkSchedule); err != nil {
 		return err
 	} else if !isExist {
 		return errors.New("操作错误，未知的工单流程")

app/model/work_instance.go

@@ -4,6 +4,7 @@ import (
 	"ArmedPolice/app/common/model"
 	"ArmedPolice/serve/orm"
 	"fmt"
+	"strings"
 	"time"
 )
 
@@ -18,6 +19,7 @@ type WorkInstanceInfo struct {
 	EquipmentCode  string    `json:"equipment_code"`
 	EquipmentTitle string    `json:"equipment_title"`
 	BreakdownTitle string    `json:"breakdown_title"`
+	ScheduleTitle  string    `json:"schedule_title"`
 	Priority       int       `json:"priority"`
 	Status         int       `json:"status"`
 	CreatedAt      time.Time `json:"created_at"`
@@ -34,8 +36,9 @@ func (m *WorkInstance) Instances(page, pageSize int, count *int64, where ...*mod
 	db := orm.GetDB().Table(m.TableName()+" AS w").
 		Select("w.id", "w.title", "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",
-			"w.status", "w.created_at").
+			"s.title AS schedule_title", "w.status", "w.created_at").
 		Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS s ON w.schedule = s.id", model.NewWorkSchedule().TableName())).
 		Where("w.is_deleted = ?", model.DeleteStatusForNot)
 
 	if len(where) > 0 {
@@ -62,15 +65,14 @@ func (m *WorkInstance) Persons(uid uint64, kind model.WorkScheduleKind, page, pa
 	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",
 			"(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",
-			"w.status", "w.created_at").
+			"s.title AS schedule_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 (SELECT id FROM %s WHERE kind = %d ORDER BY stage ASC, step ASC limit 1) AS s ON p.schedule_id = s.id",
+		Joins(fmt.Sprintf("LEFT JOIN (SELECT id, title 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).
+		Where("s.id > ?", 0)
-		Group("w.id")
 
 	if len(where) > 0 {
 		for _, wo := range where {
@@ -90,12 +92,27 @@ func (m *WorkInstance) Persons(uid uint64, kind model.WorkScheduleKind, page, pa
 
 // Workbench 个人信息
 func (m *WorkInstance) Workbench(condition *WorkbenchCondition, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*WorkInstanceInfo, error) {
+	mWorkSchedule := model.NewWorkSchedule()
+
+	_condition := fmt.Sprintf(`CASE %s 
+WHEN %d THEN 
+(SELECT GROUP_CONCAT(a.id) FROM (SELECT id FROM %s WHERE target = %d AND target_value IN (%s)) AS a) 
+WHEN %d THEN
+(SELECT GROUP_CONCAT(a.id) FROM (SELECT id FROM %s WHERE target = %d AND target_value IN (%s)) AS a) 
+ELSE  "" END`, "s.target",
+		model.WorkScheduleTargetForPerson,
+		mWorkSchedule.TableName(), model.WorkScheduleTargetForPerson, condition.UID,
+		model.WorkScheduleTargetForRole,
+		mWorkSchedule.TableName(), model.WorkScheduleTargetForRole, strings.Join(condition.RoleIDs, ","))
+
 	db := orm.GetDB().Table(m.TableName()+" AS w").
 		Select("w.id", "w.title", "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",
+			"(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",
-			"w.status", "w.created_at").
+			"s.title AS schedule_title", "w.status", "w.created_at").
 		Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
-		Where("w.is_deleted = ?", model.DeleteStatusForNot)
+		Joins(fmt.Sprintf("LEFT JOIN %s AS s ON w.schedule = s.id", mWorkSchedule.TableName())).
+		Where("w.is_deleted = ?", model.DeleteStatusForNot).
+		Where(fmt.Sprintf("FIND_IN_SET(w.schedule, %s)", _condition))
 
 	if len(where) > 0 {
 		for _, wo := range where {
@@ -104,9 +121,9 @@ func (m *WorkInstance) Workbench(condition *WorkbenchCondition, page, pageSize i
 	}
 	out := make([]*WorkInstanceInfo, 0)
 
-	//if err := orm.GetDB().Table(mWorkProgress.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot).Count(count).Error; err != nil {
+	if err := db.Count(count).Error; err != nil {
-	//	return nil, err
+		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
 	}

app/model/work_schedule.go

@@ -11,6 +11,11 @@ type WorkSchedule struct {
 	*model.WorkSchedule
 }
 
+type WorkSchedules struct {
+	*model.WorkSchedule
+	TargetValueTitle string `json:"target_value_title"`
+}
+
 // WorkScheduleInfo 工单流程信息
 type WorkScheduleInfo struct {
 	ID          uint64   `json:"id"`
@@ -98,20 +103,20 @@ func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
 }
 
 // Schedules 流程信息
-func (m *WorkSchedule) Schedules() ([]*model.WorkSchedule, error) {
+func (m *WorkSchedule) Schedules() ([]*WorkSchedules, error) {
-	sql := `SELECT s.id, s.kind, s.title, s.stage, s.step, s.target,
+	sql := `SELECT s.id, s.kind, s.title, s.stage, s.step, s.target, s.target_value,
 CASE s.target 
-WHEN 1 THEN 
+WHEN %d 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 
+WHEN %d 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 "" 
+ELSE "" END AS target_value_title, s.is_countersign, s.created_at
-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)
+	out := make([]*WorkSchedules, 0)
 
-	err := orm.GetDB().Raw(fmt.Sprintf(sql, model.NewSysUser().TableName(), model.DeleteStatusForNot,
+	err := orm.GetDB().Raw(fmt.Sprintf(sql, model.WorkScheduleTargetForPerson, model.NewSysUser().TableName(), model.DeleteStatusForNot,
-		model.NewSysRole().TableName(), model.DeleteStatusForNot, m.TableName(), model.DeleteStatusForNot)).Scan(&out).Error
+		model.WorkScheduleTargetForRole, model.NewSysRole().TableName(), model.DeleteStatusForNot,
+		m.TableName(), model.DeleteStatusForNot)).Scan(&out).Error
 
 	return out, err
 }

router/router.go

@@ -156,10 +156,13 @@ func (this *Router) registerAPI() {
 		_api := new(api.Work)
 		workV1.POST("/list", _api.Instance)
 		workV1.POST("/person", _api.Person)
+		workV1.POST("/workbench", _api.Workbench)
 		workV1.POST("/launch", _api.Launch)
 		workV1.POST("/examine", _api.Examine)
 		workV1.POST("/delete", _api.Delete)
 		workV1.GET("/schedule", _api.Schedule)
+		workV1.POST("/schedule/edit", _api.ScheduleEdit)
+		workV1.POST("/schedule/delete", _api.ScheduleDelete)
 	}
 }