From 8d60f67b0c224f84f291fabfd796f6f48fedebf2 Mon Sep 17 00:00:00 2001 From: YuleiLan Date: Tue, 1 Sep 2020 19:16:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/process/workOrder.go | 39 +++++++++++++++++++++++++++++++++++++ router/process/workOrder.go | 1 + 2 files changed, 40 insertions(+) diff --git a/apis/process/workOrder.go b/apis/process/workOrder.go index 79aa52c..932967a 100644 --- a/apis/process/workOrder.go +++ b/apis/process/workOrder.go @@ -585,3 +585,42 @@ func UrgeWorkOrder(c *gin.Context) { app.OK(c, "", "") } + +// 主动处理 +func ActiveOrder(c *gin.Context) { + var ( + workOrderId string + err error + stateValue []struct { + ID string `json:"id"` + Label string `json:"label"` + ProcessMethod string `json:"process_method"` + Processor []int `json:"processor"` + } + stateValueByte []byte + ) + + workOrderId = c.Param("id") + + err = c.ShouldBind(&stateValue) + if err != nil { + app.Error(c, -1, err, "") + return + } + + stateValueByte, err = json.Marshal(stateValue) + if err != nil { + app.Error(c, -1, fmt.Errorf("转byte失败，%v", err.Error()), "") + return + } + + err = orm.Eloquent.Model(&process.WorkOrderInfo{}). + Where("id = ?", workOrderId). + Update("state", stateValueByte).Error + if err != nil { + app.Error(c, -1, fmt.Errorf("接单失败，%v", err.Error()), "") + return + } + + app.OK(c, "", "接单成功，请及时处理") +} diff --git a/router/process/workOrder.go b/router/process/workOrder.go index b46dcd3..2e20b44 100644 --- a/router/process/workOrder.go +++ b/router/process/workOrder.go @@ -22,5 +22,6 @@ func RegisterWorkOrderRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd workOrderRouter.GET("/unity", process.UnityWorkOrder) workOrderRouter.POST("/inversion", process.InversionWorkOrder) workOrderRouter.GET("/urge", process.UrgeWorkOrder) + workOrderRouter.PUT("/active-order/:id", process.ActiveOrder) } } From 1f16e0be28bacc7290bd319fab5d3845f763cbcb Mon Sep 17 00:00:00 2001 From: YuleiLan Date: Tue, 1 Sep 2020 19:17:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=85=85sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/db.sql b/config/db.sql index f55591a..fd4553d 100644 --- a/config/db.sql +++ b/config/db.sql @@ -277,6 +277,8 @@ INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `create_time`, `update_time`, `delete_time`) VALUES (357, '', '保存LDAP配置', '', '', '/0/2/352/357', 'F', '', 'system:settings:index:ldap', 352, '0', '', '', 0, '0', '1', '', 1, '2020-08-19 13:29:08', '2020-08-19 13:29:08', NULL); INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `create_time`, `update_time`, `delete_time`) VALUES (358, '', '清空登录日志', '', '/api/v1/loginlog', '/0/63/280/214/358', 'A', 'DELETE', '', 214, '0', '', '', 0, '1', '1', '', 1, '2020-08-27 10:00:11', '2020-08-27 10:00:11', NULL); INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `create_time`, `update_time`, `delete_time`) VALUES (359, '', '清空登录日志', '', '', '/0/2/212/359', 'F', 'DELETE', 'system:sysloginlog:clean', 212, '0', '', '', 0, '0', '1', '', 1, '2020-08-27 10:01:12', '2020-08-27 10:01:12', NULL); +INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `create_time`, `update_time`, `delete_time`) VALUES (360, '', '主动接单', 'bug', '/api/v1/work-order/active-order/:id', '/0/63/281/326/360', 'A', 'PUT', '', 326, '0', '', '', 0, '1', '1', '1', 1, '2020-09-01 19:02:01', '2020-09-01 19:02:10', NULL); +INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `create_time`, `update_time`, `delete_time`) VALUES (361, '', '主动接单', '', '', '/0/268/329/361', 'F', '', 'process:list:handle:active', 329, '0', '', '', 0, '0', '1', '', 1, '2020-09-01 19:03:52', '2020-09-01 19:03:52', NULL); COMMIT; BEGIN;