Просмотр исходного кода

feature<工单> 支持时间和产品线的查询条件筛选

zhaosl 2 лет назад
Родитель
Сommit
d1f35b51e4
2 измененных файлов с 8 добавлено и 1 удалено
  1. 2 1
      opms_parent/app/model/work/work_order.go
  2. 6 0
      opms_parent/app/service/work/work_order.go

+ 2 - 1
opms_parent/app/model/work/work_order.go

@@ -32,7 +32,8 @@ type WorkOrderSearchReq struct {
 	SaleName         string      `json:"saleName"`         //销售工程师
 	SaleName         string      `json:"saleName"`         //销售工程师
 	UpdatedTimeStart *gtime.Time `json:"updatedTimeStart"` // 更新时间
 	UpdatedTimeStart *gtime.Time `json:"updatedTimeStart"` // 更新时间
 	UpdatedTimeEnd   *gtime.Time `json:"updatedTimeEnd"`   // 更新时间
 	UpdatedTimeEnd   *gtime.Time `json:"updatedTimeEnd"`   // 更新时间
-
+	SupportTime      string      `json:"supportTime"`      // 支持时间
+	ProductLine      string      `json:"productLine"`      // 产品线
 	request.PageReq
 	request.PageReq
 }
 }
 type WorkOrderReq struct {
 type WorkOrderReq struct {

+ 6 - 0
opms_parent/app/service/work/work_order.go

@@ -125,6 +125,12 @@ func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, orderL
 	if req.SaleName != "" {
 	if req.SaleName != "" {
 		db = db.WhereLike("a."+s.Dao.C.SaleName, "%"+req.SaleName+"%")
 		db = db.WhereLike("a."+s.Dao.C.SaleName, "%"+req.SaleName+"%")
 	}
 	}
+	if req.SupportTime != "" {
+		db = db.Where("a."+s.Dao.C.SupportTime, req.SupportTime)
+	}
+	if req.ProductLine != "" {
+		db = db.Where("b.product_line", req.ProductLine)
+	}
 	total, err = db.Count()
 	total, err = db.Count()
 	if err != nil {
 	if err != nil {
 		err = myerrors.DbError("获取总行数失败。")
 		err = myerrors.DbError("获取总行数失败。")