diff --git a/src/router/workorderrouter.go b/src/router/workorderrouter.go index 876de208a02e88f2328e50307bbf8f16d0d03235..8250d8db761eb6cfb1b49ba69ad1f582dac31966 100644 --- a/src/router/workorderrouter.go +++ b/src/router/workorderrouter.go @@ -36,4 +36,11 @@ func InitWorkOrderRouter(e *gin.Engine) { me.PUT("/feedback", controller.FeedbackWorkOrderMe) // 处置反馈 me.GET("/list", controller.ListWorkOrderMe) // 我的业务工单列表 } + + ////我的预警工单 + //me := so.Group("/work_order_me") + //{ + // me.PUT("/feedback", controller.FeedbackWorkOrderMe) // 处置反馈 + // me.GET("/list", controller.ListWorkOrderMe) // 我的业务工单列表 + //} } diff --git a/src/service/task_manage.go b/src/service/task_manage.go index c22ea385d736037731ea002fe317961233d4b785..f64e1542e535bd01b6c1a0ae1ea5fe31385de010 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -163,7 +163,7 @@ func (t *TaskManageSvc) ListTaskManage(req request.ListTaskManageReq) (total int finder := db.Table("task_manage").Alias("tm").Where("tm.is_delete = 0") if req.Search != "" { - finder.Where(fmt.Sprintf("(tm.task_name LIKE %s OR tm.task_desc LIKE %s OR tm.create_user LIKE %s)", + finder.Where(fmt.Sprintf("(tm.task_name LIKE '%s' OR tm.task_desc LIKE '%s' OR tm.create_user LIKE '%s')", "%"+req.Search+"%", "%"+req.Search+"%", "%"+req.Search+"%")) } if req.CreateDateFrom != "" { diff --git a/src/service/work_order.go b/src/service/work_order.go index 6a9817fc8f237d44ba6c8d7980f1ff3561528003..0afbc8cbe08aad3bbb1018b4211dcb0b03a64d9d 100644 --- a/src/service/work_order.go +++ b/src/service/work_order.go @@ -211,7 +211,7 @@ func (w *WorkOrderManageSvc) ListWorkOrderManage(req request.ListWorkOrderManage finder := db.Table("work_order_manage") if req.Search != "" { - finder.Where(fmt.Sprintf("order_name LIKE %s", "%"+req.Search+"%")) + finder.Where(fmt.Sprintf("order_name LIKE '%s'", "%"+req.Search+"%")) } if req.OrderLevel != 0 { finder.Where("order_level = ?", req.OrderLevel) @@ -364,7 +364,7 @@ func (w *WorkOrderManageSvc) ListWorkOrderIssuance(req request.ListWorkOrderReq) Join("INNER", "work_order_manage wom", "woi.order_id = wom.id") if req.Search != "" { - finder.Where(fmt.Sprintf("wom.order_name LIKE %s", "%"+req.Search+"%")) + finder.Where(fmt.Sprintf("wom.order_name LIKE '%s'", "%"+req.Search+"%")) } if req.OrderLevel != 0 { finder.Where("wom.order_level = ?", req.OrderLevel) @@ -379,7 +379,7 @@ func (w *WorkOrderManageSvc) ListWorkOrderIssuance(req request.ListWorkOrderReq) finder.Where("woi.create_time <= ?", req.CreateDateTo) } if req.CompleteTimeFrom != "" { - finder.Where("woi.complete_time <= ?", req.CompleteTimeFrom) + finder.Where("woi.complete_time >= ?", req.CompleteTimeFrom) } if req.CompleteTimeTo != "" { finder.Where("woi.complete_time <= ?", req.CompleteTimeTo) @@ -424,12 +424,15 @@ func (w *WorkOrderManageSvc) DetailsWorkOrderIssuance(id int) (workOrderIssuance var workOrderIssuance response.WorkOrderIssuance finder := db.Table("work_order_issuance").Alias("woi"). Join("INNER", "work_order_manage wom", "woi.order_id = wom.ID").Where("woi.id = ?", id) - _, err = finder.Select("woi.\"id\",woi.order_id,wom.order_name,wom.order_level,wom.order_desc,woi.order_state,woi.push_obj,woi.create_user,woi.create_time,woi.complete_time"). + has, err := finder.Select("woi.\"id\",woi.order_id,wom.order_name,wom.order_level,wom.order_desc,woi.order_state,woi.push_obj,woi.create_user,woi.create_time,woi.complete_time"). Get(&workOrderIssuance) if err != nil { err = resp.DbSelectError.WithError(err) return } + if !has { + return + } //var workOrderMe entity.WorkOrderMe finder1 := db.Table("work_order_me").Where("order_issuance_id = ?", id) @@ -521,7 +524,7 @@ func (w *WorkOrderManageSvc) ListWorkOrderMe(req request.ListWorkOrderReq) (tota Join("INNER", "work_order_manage wom", "woi.order_id = wom.id") if req.Search != "" { - finder.Where(fmt.Sprintf("wom.order_name LIKE %s", "%"+req.Search+"%")) + finder.Where(fmt.Sprintf("wom.order_name LIKE '%s'", "%"+req.Search+"%")) } if req.OrderLevel != 0 { finder.Where("wom.order_level = ?", req.OrderLevel) @@ -536,7 +539,7 @@ func (w *WorkOrderManageSvc) ListWorkOrderMe(req request.ListWorkOrderReq) (tota finder.Where("woi.create_time <= ?", req.CreateDateTo) } if req.CompleteTimeFrom != "" { - finder.Where("wome.complete_time <= ?", req.CompleteTimeFrom) + finder.Where("wome.complete_time >= ?", req.CompleteTimeFrom) } if req.CompleteTimeTo != "" { finder.Where("wome.complete_time <= ?", req.CompleteTimeTo)