Merge branch 'dev-czl' into dev

src/service/work_order.go

@@ -160,7 +160,7 @@ func (w *WorkOrderManageSvc) DelWorkOrderManage(req request.DelWorkOrderReq) (er
 }
 
 // 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()
 	if err != nil {
 		err = resp.DbConnectError.WithError(err)
@@ -180,27 +180,40 @@ func (w *WorkOrderManageSvc) DetailsWorkOrderManage(id int) (taskManageRes respo
 		return
 	}
 
-	err = json.Unmarshal([]byte(workOrder.PushObj), &taskManageRes.PushObj)
+	err = json.Unmarshal([]byte(workOrder.PushObj), &workOrderRes.PushObj)
 	if err != nil {
 		err = resp.FAIL.WithError(err)
 		return
 	}
-	err = json.Unmarshal([]byte(workOrder.TimingRule), &taskManageRes.TimingRule)
-	if err != nil {
-		err = resp.FAIL.WithError(err)
-		return
-	}
-	taskManageRes.Id = workOrder.Id
-	taskManageRes.OrderName = workOrder.OrderName
-	taskManageRes.OrderLevel = workOrder.OrderLevel
-	taskManageRes.OrderDesc = workOrder.OrderDesc
-	taskManageRes.TimingState = workOrder.TimingState
-	taskManageRes.TimingType = workOrder.TimingType
-	taskManageRes.CreateUser = workOrder.CreateUser
-	taskManageRes.CreateTime = workOrder.CreateTime
-	taskManageRes.UpdateUser = workOrder.UpdateUser
-	taskManageRes.UpdateUser = workOrder.UpdateUser
-	taskManageRes.UpdateTime = workOrder.UpdateTime
+	if workOrder.TimingType == 2 {
+		var timingWeekly request.TimingWeekly
+		err = json.Unmarshal([]byte(workOrder.TimingRule), &timingWeekly)
+		if err != nil {
+			err = resp.FAIL.WithError(err)
+			return
+		}
+		workOrderRes.TimingRule = timingWeekly
+	} else if workOrder.TimingType == 3 {
+		var timingCustom []request.TimingCustom
+		err = json.Unmarshal([]byte(workOrder.TimingRule), &timingCustom)
+		if err != nil {
+			err = resp.FAIL.WithError(err)
+			return
+		}
+		workOrderRes.TimingRule = timingCustom
+	}
+
+	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
 }