1、修复包引用问题

opms_parent/app/handler/dingtalk/ding_event.go

@@ -5,7 +5,6 @@ import (
 	"dashoo.cn/opms_libary/plugin/dingtalk"
 	dingContext "dashoo.cn/opms_libary/plugin/dingtalk/context"
 	"dashoo.cn/opms_libary/plugin/dingtalk/message"
-	model
 	model "dashoo.cn/opms_parent/app/model/workflow"
 	baseSrv "dashoo.cn/opms_parent/app/service/base"
 	contractSrv "dashoo.cn/opms_parent/app/service/contract"
@@ -14,7 +13,7 @@ import (
 	platServer "dashoo.cn/opms_parent/app/service/plat"
 	projService "dashoo.cn/opms_parent/app/service/proj"
 	workService "dashoo.cn/opms_parent/app/service/work"
-	"dashoo.cn/opms_libary/plugin/dingtalk/message"
+	workflowServer "dashoo.cn/opms_parent/app/service/workflow"
 	"database/sql"
 	"fmt"
 	"github.com/gogf/gf/os/glog"

opms_parent/app/handler/opsdev/operation.go

@@ -5,9 +5,8 @@ import (
 
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
-	opsdevmodel "dasho
 	opsdevmodel "dashoo.cn/opms_parent/app/model/opsdev"
-	"dashoo.cn/opms_libary/myerrors"
+	opsdevSrv "dashoo.cn/opms_parent/app/service/opsdev"
 
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
@@ -226,4 +225,3 @@ func (h *OperationHandler) GetHistoryList(ctx context.Context, req *opsdevmodel.
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
-}

opms_parent/app/model/cust/cust_customer.go

@@ -6,6 +6,7 @@ package cust
 
 import (
 	"dashoo.cn/opms_libary/request"
+	"dashoo.cn/opms_parent/app/model/cust/internal"
 )
 
 // CustCustomer is the golang structure for table cust_customer.

opms_parent/app/model/partner/partner_company.go

@@ -6,7 +6,7 @@ package model
 
 import (
 	"dashoo.cn/opms_libary/request"
-	
+	"dashoo.cn/opms_parent/app/model/partner/internal"
 )
 
 // PartnerCompany is the golang structure for table partner_company.

opms_parent/app/model/plat/plat_followup.go

@@ -5,11 +5,10 @@
 package plat
 
 import (
-	"time"
-
 	"dashoo.cn/opms_libary/request"
-	"dashoo.cn/opms_parent/app/mo
+	"dashoo.cn/opms_parent/app/model/plat/internal"
 	"github.com/gogf/gf/os/gtime"
+	"time"
 )
 
 // PlatFollowup is the golang structure for table plat_followup.

opms_parent/app/model/proj/proj_business.go

@@ -6,7 +6,7 @@ package model
 
 import (
 	"dashoo.cn/opms_libary/request"
-	"dashoo.cn/opms_parent/app/mo
+	"dashoo.cn/opms_parent/app/model/proj/internal"
 	"github.com/gogf/gf/os/gtime"
 )
 

opms_parent/app/model/sys_report/sys_report.go

@@ -6,7 +6,7 @@ package sys_report
 
 import (
 	"dashoo.cn/opms_libary/request"
-	"dashoo.cn/opms_parent/app/mo
+	"dashoo.cn/opms_parent/app/model/sys_report/internal"
 	"github.com/gogf/gf/os/gtime"
 )
 

opms_parent/app/model/train/train_head_office.go

@@ -6,7 +6,7 @@ package model
 
 import (
 	"dashoo.cn/opms_libary/request"
-	"dashoo.cn/opms_parent/app/mo
+	"dashoo.cn/opms_parent/app/model/train/internal"
 	"github.com/gogf/gf/os/gtime"
 )
 

opms_parent/app/model/work/deliver_order.go

@@ -6,9 +6,8 @@ package work
 
 import (
 	"dashoo.cn/opms_libary/request"
-	contractmodel "dashoo.c
 	contractmodel "dashoo.cn/opms_parent/app/model/contract"
-	"dashoo.cn/opms_libary/request"
+	"dashoo.cn/opms_parent/app/model/work/internal"
 	"github.com/gogf/gf/os/gtime"
 )
 

opms_parent/app/model/workflow/plat_workflow.go

@@ -6,7 +6,7 @@ package workflow
 
 import (
 	"dashoo.cn/opms_libary/request"
-	
+	"dashoo.cn/opms_parent/app/model/workflow/internal"
 )
 
 // BizType 业务类型(10客户20项目创建30合同创建)

opms_parent/app/service/base/base_distributor.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+	workflowService "dashoo.cn/opms_parent/app/service/workflow"
 	"database/sql"
 	"encoding/json"
 	"fmt"
@@ -29,7 +30,6 @@ import (
 	"dashoo.cn/opms_libary/plugin/dingtalk/message"
 	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
 	"dashoo.cn/opms_libary/utils"
-	"dasho
 	"dashoo.cn/opms_parent/app/dao/base"
 	contractdao "dashoo.cn/opms_parent/app/dao/contract"
 	projdao "dashoo.cn/opms_parent/app/dao/proj"
@@ -38,7 +38,6 @@ import (
 	projmodel "dashoo.cn/opms_parent/app/model/proj"
 	workflowmodel "dashoo.cn/opms_parent/app/model/workflow"
 	"dashoo.cn/opms_parent/app/service"
-	"dashoo.cn/opms_libary/utils"
 )
 
 type distributorService struct {

opms_parent/app/service/cust/cust_cron.go

@@ -3,7 +3,7 @@ package cust
 import (
 	"dashoo.cn/opms_libary/plugin/dingtalk"
 	"dashoo.cn/opms_libary/plugin/dingtalk/message/corpconversation"
-	"dash
+	"dashoo.cn/opms_parent/app/service"
 	"fmt"
 	"github.com/360EntSecGroup-Skylar/excelize"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/service/plat/plat_followup.go

@@ -2,15 +2,14 @@ package plat
 
 import (
 	"context"
+	projDao "dashoo.cn/opms_parent/app/dao/proj"
 	"database/sql"
 	"strconv"
 	"strings"
 
 	"dashoo.cn/opms_libary/myerrors"
-	distDao "d
 	distDao "dashoo.cn/opms_parent/app/dao/base"
 	"dashoo.cn/opms_parent/app/dao/cust"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/container/garray"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"

opms_parent/app/service/proj/business.go

@@ -3,29 +3,27 @@ package proj
 import (
 	"context"
 	platDao "dashoo.cn/opms_parent/app/dao/plat"
+	workflowService "dashoo.cn/opms_parent/app/service/workflow"
 	"github.com/gogf/gf/container/garray"
 	"os"
 
 	"dashoo.cn/opms_libary/plugin/dingtalk"
-	contractDao
 	contractDao "dashoo.cn/opms_parent/app/dao/contract"
 	custDao "dashoo.cn/opms_parent/app/dao/cust"
 	projDao "dashoo.cn/opms_parent/app/dao/proj"
 	contractModel "dashoo.cn/opms_parent/app/model/contract"
 	model "dashoo.cn/opms_parent/app/model/proj"
 	workflowModel "dashoo.cn/opms_parent/app/model/workflow"
-	"dashoo.cn/opms_libary/plugin/dingtalk"
 
-	"fmt"
-	"strconv"
-	"strings"
-	"dashoo.cn/opms_parent/app/service"
 	"dashoo.cn/opms_libary/multipart"
 	"dashoo.cn/opms_libary/myerrors"
 	"dashoo.cn/opms_libary/plugin/dingtalk/message"
 	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
-s"
-	"dashoo.cn/opms_parent/app
+	"dashoo.cn/opms_parent/app/service"
+	"fmt"
+	"strconv"
+	"strings"
+
 	"dashoo.cn/opms_libary/utils"
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/service/sys_report/sys_report.go

@@ -6,7 +6,7 @@ import (
 	"dashoo.cn/opms_libary/myerrors"
 	"dashoo.cn/opms_libary/request"
 	dao "dashoo.cn/opms_parent/app/dao/sys_report"
-	"da
+	sys_report "dashoo.cn/opms_parent/app/model/sys_report"
 	"database/sql"
 	"fmt"
 	"github.com/gogf/gf/frame/g"
@@ -61,7 +61,7 @@ func (s SysReportService) List(ctx context.Context, req *sys_report.SysReportLis
 	}
 	dao = dao.Order(orderby)
 
-	ents := []*model.SysReport{}
+	ents := []*sys_report.SysReport{}
 	err = dao.Structs(&ents)
 	if err != nil && err != sql.ErrNoRows {
 		return 0, nil, err
@@ -113,7 +113,7 @@ func (s SysReportService) Delete(ctx context.Context, Id []int) error {
 	_, err := s.Dao.Where("Id  IN (?)", Id).Data(g.Map{"deleted_time": gtime.Now()}).Update()
 	return err
 }
-func (s SysReportService) Get(ctx context.Context, id int) (entity model.SysReport, err error) {
+func (s SysReportService) Get(ctx context.Context, id int) (entity sys_report.SysReport, err error) {
 	err = s.Dao.Where("Id = ?", id).Scan(&entity)
 	if err != nil {
 		return entity, err

opms_parent/app/service/train/sale_apply.go

@@ -3,10 +3,9 @@ package train
 import (
 	"context"
 	"dashoo.cn/opms_libary/myerrors"
-	dao "da
 	dao "dashoo.cn/opms_parent/app/dao/train"
 	model "dashoo.cn/opms_parent/app/model/train"
-	"dashoo.cn/opms_libary/myerrors"
+	"dashoo.cn/opms_parent/app/service"
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gconv"

opms_parent/app/service/work/deliver_order.go

@@ -2,8 +2,9 @@ package work
 
 import (
 	"context"
-	"dashoo.cn/opms_libary/plugin/dingtalk/workf
+	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
 	model "dashoo.cn/opms_parent/app/model/base"
+	"dashoo.cn/opms_parent/app/model/work"
 	workflowModel "dashoo.cn/opms_parent/app/model/workflow"
 	workflowService "dashoo.cn/opms_parent/app/service/workflow"
 	"database/sql"
@@ -13,9 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-s"
-
-	"dashoo.cn/opms_libary/plugin/dingtalk/m
+	"dashoo.cn/opms_libary/plugin/dingtalk/message"
 	basedao "dashoo.cn/opms_parent/app/dao/base"
 	contractdao "dashoo.cn/opms_parent/app/dao/contract"
 	custdao "dashoo.cn/opms_parent/app/dao/cust"
@@ -23,7 +22,6 @@ s"
 	workdao "dashoo.cn/opms_parent/app/dao/work"
 	contractmodel "dashoo.cn/opms_parent/app/model/contract"
 	"dashoo.cn/opms_parent/app/service"
-	"dashoo.cn/opms_libary/plugin/dingtalk/message"
 
 	"dashoo.cn/opms_libary/micro_srv"
 	"dashoo.cn/opms_libary/myerrors"

opms_parent/app/service/workflow/work_flow.go

@@ -8,7 +8,8 @@ import (
 	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
 	"dashoo.cn/opms_libary/utils"
 	dao "dashoo.cn/opms_parent/app/dao/workflow"
-	model "dashoo.cn/opms_parent/app/model/workflo
+	model "dashoo.cn/opms_parent/app/model/workflow"
+	"dashoo.cn/opms_parent/app/service"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"

opms_parent/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gogf/gf v1.16.9
 	github.com/mozillazg/go-pinyin v0.19.0
 	github.com/robfig/cron v1.2.0
-	github.com/shopspring/decimal v1.3.1
+	github.com/shopspring/decimal v1.4.0
 	github.com/smallnest/rpcx v1.8.0
 	github.com/xuri/excelize/v2 v2.6.0
 	golang.org/x/tools v0.6.0

opms_parent/go.sum

@@ -396,8 +396,8 @@ github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod h1:gi+0
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=