小程序客户联调完成

opms_parent/app/service/work/work_order.go

@@ -6,9 +6,8 @@ import (
 	"strconv"
 
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/360EntSecGroup-Skylar/excelize"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
 
 	"dashoo.cn/micro/app/dao/work"
 	model "dashoo.cn/micro/app/model/work"
@@ -34,21 +33,19 @@ func NewOrderService(ctx context.Context) (svc *OrderService, err error) {
 }
 
 //列表
-func (w *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
-	Model := w.Dao.M
-	Model.Where(w.Dao.Columns.DeletedTime + " is null ")
+func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
+	Model := s.Dao
 	//工单类型
 	if req.OrderTypeId != 0 {
-		Model.Where(w.Dao.Columns.OrderTypeId, req.OrderTypeId)
+		Model.Where(s.Dao.Columns.OrderTypeId, req.OrderTypeId)
 	}
 	//工单状态
 	if req.OrderStatus != "" {
-		Model.Where(w.Dao.Columns.OrderStatus, req.OrderStatus)
+		Model.Where(s.Dao.Columns.OrderStatus, req.OrderStatus)
 	}
 	total, err = Model.Fields().Count()
 	if err != nil {
-		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	if req.PageNum == 0 {
@@ -62,10 +59,10 @@ func (w *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderL
 }
 
 // 导出
-func (w *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.WorkByteExport, err error) {
+func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.WorkByteExport, err error) {
 	var con model.WorkByteExport
 	req.WorkOrderSearchReq.PageSize = 10
-	total, data, err := w.GetList(&req.WorkOrderSearchReq)
+	total, data, err := s.GetList(&req.WorkOrderSearchReq)
 	if err != nil {
 		return
 	}
@@ -110,12 +107,11 @@ func (w *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 }
 
 //详情
-func (w *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
-	Model := w.Dao.M
-	err = Model.Where(w.Dao.Columns.DeletedTime+" is null ").Where(w.Dao.Columns.Id, req.Id).Scan(&detail)
+func (s *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
+	Model := s.Dao
+	err = Model.Where(s.Dao.Columns.Id, req.Id).Scan(&detail)
 	if err != nil {
-		g.Log().Error(err)
-		gerror.New("获取详情失败")
+		err = myerrors.DbError("获取详情失败。")
 		return
 	}
 	return

opms_parent/main.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"context"
-	"dashoo.cn/opms_libary/myerrors"
 	"net/http"
 
+	"dashoo.cn/opms_libary/myerrors"
+
 	"dashoo.cn/opms_libary/micro_srv"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
@@ -15,6 +16,7 @@ import (
 	"dashoo.cn/micro/app/handler/cust"
 	"dashoo.cn/micro/app/handler/plat"
 	projHandler "dashoo.cn/micro/app/handler/proj"
+	"dashoo.cn/micro/app/handler/work"
 )
 
 func main() {
@@ -48,7 +50,7 @@ func main() {
 	s.RegisterName("CtrContractCollection", new(contract.CtrContractCollection), "")
 	s.RegisterName("CtrContractAppend", new(contract.CtrContractAppend), "")
 	s.RegisterName("CtrContractInvoice", new(contract.CtrContractInvoice), "")
-
+	s.RegisterName("WorkOrder", new(work.WorkOrderHandler), "")
 	s.RegisterName("Schedule", new(plat.ScheduleHeader), "")
 
 	// 注册服务对象