Merge branch 'dev-czl' into dev

src/bean/vo/request/work_order.go

 package request
 
 type AddWorkOrderReq struct {
+	IsPush       int            `json:"is_push"`                           // 是否立刻下发(0否 1是)
 	OrderName    string         `json:"order_name" binding:"required"`     // 工单名称
 	OrderLevel   int            `json:"order_level" binding:"oneof=1 2 3"` // 工单等级(1紧急任务 2重要任务 3一般任务)
 	OrderDesc    string         `json:"order_desc" binding:"required"`     // 工单描述
@@ -35,6 +36,7 @@ type TimingCustom struct {
 }
 
 type EditWorkOrderReq struct {
+	IsPush       int            `json:"is_push" binding:"required"`        // 是否立刻下发(0否 1是)
 	Id           int            `json:"id" binding:"required"`             // 主键id
 	OrderLevel   int            `json:"order_level" binding:"oneof=1 2 3"` // 工单等级(1紧急任务 2重要任务 3一般任务)
 	OrderDesc    string         `json:"order_desc" binding:"required"`     // 工单描述

src/service/work_order.go

@@ -75,6 +75,16 @@ func (w *WorkOrderManageSvc) AddWorkOrderManage(req request.AddWorkOrderReq) (er
 		err = resp.DbInsertError.WithError(err)
 		return
 	}
+
+	//是否立刻下发
+	if req.IsPush == 1 {
+		push := request.PushWorkOrderReq{
+			Id:      workOrder.Id,
+			PushObj: req.PushObj,
+		}
+		w.PushWorkOrderManage(push)
+	}
+
 	return
 }
 
@@ -123,6 +133,15 @@ func (w *WorkOrderManageSvc) EditWorkOrderManage(req request.EditWorkOrderReq) (
 		err = resp.DbUpdateError.WithError(err)
 		return
 	}
+
+	//是否立刻下发
+	if req.IsPush == 1 {
+		push := request.PushWorkOrderReq{
+			Id:      req.Id,
+			PushObj: req.PushObj,
+		}
+		w.PushWorkOrderManage(push)
+	}
 	return
 }