Skip to content

S
so-operation-api
"src/controller/alert_overview.go" did not exist on "90bbdca96c635bf6eeef94c6eb65057adbefb11b"
Commit e332acf7 authored by 陈子龙's avatar 陈子龙
Browse files
Options

Merge branch 'dev-czl' into dev

parents 795ec807 03b40f51
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 18 deletions
src/service/work_order.go
View file @ e332acf7
...@@ -160,7 +160,7 @@ func (w *WorkOrderManageSvc) DelWorkOrderManage(req request.DelWorkOrderReq) (er ...@@ -160,7 +160,7 @@ func (w *WorkOrderManageSvc) DelWorkOrderManage(req request.DelWorkOrderReq) (er
} }
// DetailsWorkOrderManage 详情 // DetailsWorkOrderManage 详情
func (w *WorkOrderManageSvc) DetailsWorkOrderManage(id int) (taskManageRes response.WorkOrderRes, err error) { func (w *WorkOrderManageSvc) DetailsWorkOrderManage(id int) (workOrderRes response.WorkOrderRes, err error) {
db, err := client.GetDbClient() db, err := client.GetDbClient()
if err != nil { if err != nil {
err = resp.DbConnectError.WithError(err) err = resp.DbConnectError.WithError(err)
...@@ -180,27 +180,40 @@ func (w *WorkOrderManageSvc) DetailsWorkOrderManage(id int) (taskManageRes respo ...@@ -180,27 +180,40 @@ func (w *WorkOrderManageSvc) DetailsWorkOrderManage(id int) (taskManageRes respo
return return
} }
err = json.Unmarshal([]byte(workOrder.PushObj), &taskManageRes.PushObj) err = json.Unmarshal([]byte(workOrder.PushObj), &workOrderRes.PushObj)
if err != nil { if err != nil {
err = resp.FAIL.WithError(err) err = resp.FAIL.WithError(err)
return return
} }
err = json.Unmarshal([]byte(workOrder.TimingRule), &taskManageRes.TimingRule) if workOrder.TimingType == 2 {
var timingWeekly request.TimingWeekly
err = json.Unmarshal([]byte(workOrder.TimingRule), &timingWeekly)
if err != nil { if err != nil {
err = resp.FAIL.WithError(err) err = resp.FAIL.WithError(err)
return return
} }
taskManageRes.Id = workOrder.Id workOrderRes.TimingRule = timingWeekly
taskManageRes.OrderName = workOrder.OrderName } else if workOrder.TimingType == 3 {
taskManageRes.OrderLevel = workOrder.OrderLevel var timingCustom []request.TimingCustom
taskManageRes.OrderDesc = workOrder.OrderDesc err = json.Unmarshal([]byte(workOrder.TimingRule), &timingCustom)
taskManageRes.TimingState = workOrder.TimingState if err != nil {
taskManageRes.TimingType = workOrder.TimingType err = resp.FAIL.WithError(err)
taskManageRes.CreateUser = workOrder.CreateUser return
taskManageRes.CreateTime = workOrder.CreateTime }
taskManageRes.UpdateUser = workOrder.UpdateUser workOrderRes.TimingRule = timingCustom
taskManageRes.UpdateUser = workOrder.UpdateUser }
taskManageRes.UpdateTime = workOrder.UpdateTime
workOrderRes.Id = workOrder.Id
workOrderRes.OrderName = workOrder.OrderName
workOrderRes.OrderLevel = workOrder.OrderLevel
workOrderRes.OrderDesc = workOrder.OrderDesc
workOrderRes.TimingState = workOrder.TimingState
workOrderRes.TimingType = workOrder.TimingType
workOrderRes.CreateUser = workOrder.CreateUser
workOrderRes.CreateTime = workOrder.CreateTime
workOrderRes.UpdateUser = workOrder.UpdateUser
workOrderRes.UpdateUser = workOrder.UpdateUser
workOrderRes.UpdateTime = workOrder.UpdateTime
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment