Browse Source

feature(工单): 工单管理

ZZH-wl 2 years ago
parent
commit
879b63a198
28 changed files with 3036 additions and 252 deletions
  1. 605 89
      doc/订单全流程管理平台.pdma.json
  2. 1 1
      opms_admin/app/service/sys_user.go
  3. 41 20
      opms_parent/app/dao/work/internal/work_order.go
  4. 1 1
      opms_parent/app/dao/work/internal/work_order_dynamics.go
  5. 753 0
      opms_parent/app/dao/work/internal/work_order_feedback.go
  6. 747 0
      opms_parent/app/dao/work/internal/work_order_feedback_file.go
  7. 40 37
      opms_parent/app/dao/work/internal/work_order_type.go
  8. 36 0
      opms_parent/app/dao/work/work_order_feedback.go
  9. 36 0
      opms_parent/app/dao/work/work_order_feedback_file.go
  10. 4 0
      opms_parent/app/handler/proj/business.go
  11. 119 10
      opms_parent/app/handler/work/work_order.go
  12. 106 0
      opms_parent/app/handler/work/work_order_type.go
  13. 8 4
      opms_parent/app/model/work/internal/work_order.go
  14. 27 0
      opms_parent/app/model/work/internal/work_order_feedback.go
  15. 25 0
      opms_parent/app/model/work/internal/work_order_feedback_file.go
  16. 13 12
      opms_parent/app/model/work/internal/work_order_type.go
  17. 60 31
      opms_parent/app/model/work/work_order.go
  18. 14 0
      opms_parent/app/model/work/work_order_feedback.go
  19. 14 0
      opms_parent/app/model/work/work_order_feedback_file.go
  20. 19 0
      opms_parent/app/model/work/work_order_type.go
  21. 3 0
      opms_parent/app/service/base.go
  22. 1 4
      opms_parent/app/service/base/base_product.go
  23. 21 18
      opms_parent/app/service/proj/business.go
  24. 0 2
      opms_parent/app/service/proj/const.go
  25. 235 23
      opms_parent/app/service/work/work_order.go
  26. 92 0
      opms_parent/app/service/work/work_order_type.go
  27. 13 0
      opms_parent/app/service/workflow/work_flow.go
  28. 2 0
      opms_parent/main.go

File diff suppressed because it is too large
+ 605 - 89
doc/订单全流程管理平台.pdma.json


+ 1 - 1
opms_admin/app/service/sys_user.go

@@ -135,7 +135,7 @@ func (s *UserService) GetUserList(req *model.SysUserSearchReq) (total int, userL
 	if req.OrderBy == "createdTime" {
 		userModel = userModel.OrderAsc("u.created_time")
 	}
-	err = userModel.Page(req.PageNum, req.PageSize).Scan(&userList)
+	err = userModel.Page(req.GetPage()).Scan(&userList)
 	deptService, _ := NewDeptService(s.Ctx)
 	deptInfo, err := deptService.GetAllDeptName()
 	if err != nil {

+ 41 - 20
opms_parent/app/dao/work/internal/work_order.go

@@ -30,12 +30,16 @@ type WorkOrderDao struct {
 // WorkOrderColumns defines and stores column names for table work_order.
 type workOrderColumns struct {
 	Id             string // 主键
+	Name           string // 工单名称
+	NboId          string // 关联项目
+	NboCode        string // 项目编码
+	NboName        string // 项目名称
+	CustId         string // 关联客户
+	CustName       string // 客户名称
 	OrderTypeId    string // 工单类型
-	OrderTypeDesc  string // 工单类型描述
+	OrderTypeName  string // 工单类型名称
 	OrderStatus    string // 工单状态(10发起20审批中30审批通过40审批拒绝50关闭)
-	WorkflowId     string // 关联工作流
-	FormId         string // 关联表单
-	FormData       string // 表单信息
+	FormData       string // 表单数据
 	AssignUserId   string // 分派人员ID
 	AssignUserName string // 分派人员姓名
 	Feedback       string // 反馈信息
@@ -58,11 +62,15 @@ var (
 		Table: "work_order",
 		C: workOrderColumns{
 			Id:             "id",
+			Name:           "name",
+			NboId:          "nbo_id",
+			NboCode:        "nbo_code",
+			NboName:        "nbo_name",
+			CustId:         "cust_id",
+			CustName:       "cust_name",
 			OrderTypeId:    "order_type_id",
-			OrderTypeDesc:  "order_type_desc",
+			OrderTypeName:  "order_type_name",
 			OrderStatus:    "order_status",
-			WorkflowId:     "workflow_id",
-			FormId:         "form_id",
 			FormData:       "form_data",
 			AssignUserId:   "assign_user_id",
 			AssignUserName: "assign_user_name",
@@ -88,11 +96,15 @@ func NewWorkOrderDao(tenant string) WorkOrderDao {
 		Table: "work_order",
 		C: workOrderColumns{
 			Id:             "id",
+			Name:           "name",
+			NboId:          "nbo_id",
+			NboCode:        "nbo_code",
+			NboName:        "nbo_name",
+			CustId:         "cust_id",
+			CustName:       "cust_name",
 			OrderTypeId:    "order_type_id",
-			OrderTypeDesc:  "order_type_desc",
+			OrderTypeName:  "order_type_name",
 			OrderStatus:    "order_status",
-			WorkflowId:     "workflow_id",
-			FormId:         "form_id",
 			FormData:       "form_data",
 			AssignUserId:   "assign_user_id",
 			AssignUserName: "assign_user_name",
@@ -706,13 +718,20 @@ func (d *WorkOrderDao) Unscoped() *WorkOrderDao {
 }
 
 // DataScope enables the DataScope feature.
-func (d *WorkOrderDao) DataScope(ctx context.Context, userCol ...string) *WorkOrderDao {
+func (d *WorkOrderDao) DataScope(ctx context.Context, args ...interface{}) *WorkOrderDao {
 	cs := ctx.Value("contextService")
-	dataScope := gconv.Map(cs)["dataScope"].(g.Map)
+	dataScope := gconv.Map(gconv.String(gconv.Map(cs)["dataScope"]))
 	if dataScope != nil {
-		tableAs := d.TableAs
-		if d.TableAs != "" {
-			tableAs += "."
+		var specialFlag bool
+		var tableAs string
+		if d.TableAs != "" && len(args) <= 1 {
+			tableAs = d.TableAs + "."
+		}
+		if len(args) > 1 {
+			specialFlag = true
+			if val, ok := args[1].(string); ok {
+				tableAs = val + "."
+			}
 		}
 		userIds, ok := dataScope["userIds"]
 		delete(dataScope, "userIds")
@@ -720,10 +739,10 @@ func (d *WorkOrderDao) DataScope(ctx context.Context, userCol ...string) *WorkOr
 		var orValues []interface{}
 		if ok && userIds != "-1" {
 			column := "created_by"
-			if len(userCol) == 1 {
-				column = userCol[0]
+			if len(args) > 0 {
+				column = args[0].(string)
 			}
-			if ok, _ := d.M.HasField(column); ok {
+			if ok, _ := d.M.HasField(column); ok || specialFlag {
 				orColumns = append(orColumns, tableAs+column+" IN (?) ")
 				orValues = append(orValues, userIds)
 			}
@@ -731,6 +750,8 @@ func (d *WorkOrderDao) DataScope(ctx context.Context, userCol ...string) *WorkOr
 		// 销售工程师判断
 		var salesEngineerFlag bool
 		if roles, ok := dataScope["roles"]; ok {
+			delete(dataScope, "roles")
+			delete(dataScope, "posts")
 			arr := garray.NewArrayFrom(roles.([]interface{}), true)
 			if arr.Len() == 1 && arr.Contains("SalesEngineer") {
 				salesEngineerFlag = true
@@ -739,7 +760,7 @@ func (d *WorkOrderDao) DataScope(ctx context.Context, userCol ...string) *WorkOr
 		// 非销售工程师权限加成
 		if !salesEngineerFlag {
 			bigColumns := "is_big"
-			if ok, _ := d.M.HasField("is_big"); ok {
+			if ok, _ := d.M.HasField("is_big"); ok || specialFlag {
 				if val, ok := dataScope[bigColumns]; ok && val != "" {
 					orColumns = append(orColumns, tableAs+bigColumns+" = ? ")
 					orValues = append(orValues, val)
@@ -749,7 +770,7 @@ func (d *WorkOrderDao) DataScope(ctx context.Context, userCol ...string) *WorkOr
 			var andColumns []string
 			var andValues []interface{}
 			for k, v := range dataScope {
-				if ok, _ := d.M.HasField(k); ok {
+				if ok, _ := d.M.HasField(k); ok || specialFlag {
 					andColumns = append(andColumns, tableAs+k+" IN (?) ")
 					andValues = append(andValues, v)
 				}

+ 1 - 1
opms_parent/app/dao/work/internal/work_order_dynamics.go

@@ -696,7 +696,7 @@ func (d *WorkOrderDynamicsDao) Unscoped() *WorkOrderDynamicsDao {
 // DataScope enables the DataScope feature.
 func (d *WorkOrderDynamicsDao) DataScope(ctx context.Context, userCol ...string) *WorkOrderDynamicsDao {
 	cs := ctx.Value("contextService")
-	dataScope := gconv.Map(cs)["dataScope"].(g.Map)
+	dataScope := gconv.Map(gconv.String(gconv.Map(cs)["dataScope"]))
 	if dataScope != nil {
 		tableAs := d.TableAs
 		if d.TableAs != "" {

+ 753 - 0
opms_parent/app/dao/work/internal/work_order_feedback.go

@@ -0,0 +1,753 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+	"database/sql"
+	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/frame/gmvc"
+	"github.com/gogf/gf/util/gconv"
+	"strings"
+	"time"
+
+	model "dashoo.cn/micro/app/model/work"
+)
+
+// WorkOrderFeedbackDao is the manager for logic model data accessing and custom defined data operations functions management.
+type WorkOrderFeedbackDao struct {
+	gmvc.M                           // M is the core and embedded struct that inherits all chaining operations from gdb.Model.
+	C       workOrderFeedbackColumns // C is the short type for Columns, which contains all the column names of Table for convenient usage.
+	DB      gdb.DB                   // DB is the raw underlying database management object.
+	Table   string                   // Table is the underlying table name of the DAO.
+	TableAs string                   // TableAs is the underlying table alias name of the DAO.
+}
+
+// WorkOrderFeedbackColumns defines and stores column names for table work_order_feedback.
+type workOrderFeedbackColumns struct {
+	Id          string // 主键
+	OrderId     string // 关联工单
+	FeePeopleId string // 反馈人ID
+	FeePeople   string // 反馈人
+	FeeDate     string // 反馈日期
+	Feedback    string // 反馈信息
+	Remark      string // 备注
+	CreatedBy   string // 创建者
+	CreatedName string // 创建人
+	CreatedTime string // 创建时间
+	UpdatedBy   string // 更新者
+	UpdatedName string // 更新人
+	UpdatedTime string // 更新时间
+	DeletedTime string // 删除时间
+}
+
+var (
+	// WorkOrderFeedback is globally public accessible object for table work_order_feedback operations.
+	WorkOrderFeedback = WorkOrderFeedbackDao{
+		M:     g.DB("default").Model("work_order_feedback").Safe(),
+		DB:    g.DB("default"),
+		Table: "work_order_feedback",
+		C: workOrderFeedbackColumns{
+			Id:          "id",
+			OrderId:     "order_id",
+			FeePeopleId: "fee_people_id",
+			FeePeople:   "fee_people",
+			FeeDate:     "fee_date",
+			Feedback:    "feedback",
+			Remark:      "remark",
+			CreatedBy:   "created_by",
+			CreatedName: "created_name",
+			CreatedTime: "created_time",
+			UpdatedBy:   "updated_by",
+			UpdatedName: "updated_name",
+			UpdatedTime: "updated_time",
+			DeletedTime: "deleted_time",
+		},
+	}
+)
+
+func NewWorkOrderFeedbackDao(tenant string) WorkOrderFeedbackDao {
+	var dao WorkOrderFeedbackDao
+	dao = WorkOrderFeedbackDao{
+		M:     g.DB(tenant).Model("work_order_feedback").Safe(),
+		DB:    g.DB(tenant),
+		Table: "work_order_feedback",
+		C: workOrderFeedbackColumns{
+			Id:          "id",
+			OrderId:     "order_id",
+			FeePeopleId: "fee_people_id",
+			FeePeople:   "fee_people",
+			FeeDate:     "fee_date",
+			Feedback:    "feedback",
+			Remark:      "remark",
+			CreatedBy:   "created_by",
+			CreatedName: "created_name",
+			CreatedTime: "created_time",
+			UpdatedBy:   "updated_by",
+			UpdatedName: "updated_name",
+			UpdatedTime: "updated_time",
+			DeletedTime: "deleted_time",
+		},
+	}
+	return dao
+}
+
+// Ctx is a chaining function, which creates and returns a new DB that is a shallow copy
+// of current DB object and with given context in it.
+// Note that this returned DB object can be used only once, so do not assign it to
+// a global or package variable for long using.
+func (d *WorkOrderFeedbackDao) Ctx(ctx context.Context) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Ctx(ctx), Table: d.Table, TableAs: d.TableAs}
+}
+
+// GetCtx returns the context for current Model.
+// It returns "context.Background() i"s there's no context previously set.
+func (d *WorkOrderFeedbackDao) GetCtx() context.Context {
+	return d.M.GetCtx()
+}
+
+// As sets an alias name for current table.
+func (d *WorkOrderFeedbackDao) As(as string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.As(as), Table: d.Table, TableAs: as}
+}
+
+// TX sets the transaction for current operation.
+func (d *WorkOrderFeedbackDao) TX(tx *gdb.TX) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.TX(tx), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Master marks the following operation on master node.
+func (d *WorkOrderFeedbackDao) Master() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Master(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Slave marks the following operation on slave node.
+// Note that it makes sense only if there's any slave node configured.
+func (d *WorkOrderFeedbackDao) Slave() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Slave(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Args sets custom arguments for model operation.
+func (d *WorkOrderFeedbackDao) Args(args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Args(args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Handler calls each of "handlers" on current Model and returns a new Model.
+// ModelHandler is a function that handles given Model and returns a new Model that is custom modified.
+func (d *WorkOrderFeedbackDao) Handler(handlers ...gdb.ModelHandler) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Handler(handlers...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// LeftJoin does "LEFT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").LeftJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").LeftJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackDao) LeftJoin(table ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.LeftJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// RightJoin does "RIGHT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").RightJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").RightJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackDao) RightJoin(table ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.RightJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// InnerJoin does "INNER JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").InnerJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").InnerJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackDao) InnerJoin(table ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.InnerJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Fields sets the operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *WorkOrderFeedbackDao) Fields(fieldNamesOrMapStruct ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Fields(fieldNamesOrMapStruct...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldsEx sets the excluded operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *WorkOrderFeedbackDao) FieldsEx(fieldNamesOrMapStruct ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldsEx(fieldNamesOrMapStruct...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldCount formats and appends commonly used field "COUNT(column)" to the select fields of model.
+func (d *WorkOrderFeedbackDao) FieldCount(column string, as ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldCount(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldSum formats and appends commonly used field "SUM(column)" to the select fields of model.
+func (d *WorkOrderFeedbackDao) FieldSum(column string, as ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldSum(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldMin formats and appends commonly used field "MIN(column)" to the select fields of model.
+func (d *WorkOrderFeedbackDao) FieldMin(column string, as ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldMin(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldMax formats and appends commonly used field "MAX(column)" to the select fields of model.
+func (d *WorkOrderFeedbackDao) FieldMax(column string, as ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldMax(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldAvg formats and appends commonly used field "AVG(column)" to the select fields of model.
+func (d *WorkOrderFeedbackDao) FieldAvg(column string, as ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.FieldAvg(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Option adds extra operation option for the model.
+// Deprecated, use separate operations instead.
+func (d *WorkOrderFeedbackDao) Option(option int) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Option(option), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
+// the data and where attributes for empty values.
+func (d *WorkOrderFeedbackDao) OmitEmpty() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitEmpty(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmptyWhere sets optionOmitEmptyWhere option for the model, which automatically filers
+// the Where/Having parameters for "empty" values.
+func (d *WorkOrderFeedbackDao) OmitEmptyWhere() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitEmptyWhere(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmptyData sets optionOmitEmptyData option for the model, which automatically filers
+// the Data parameters for "empty" values.
+func (d *WorkOrderFeedbackDao) OmitEmptyData() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitEmptyData(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNil sets optionOmitNil option for the model, which automatically filers
+// the data and where parameters for "nil" values.
+func (d *WorkOrderFeedbackDao) OmitNil() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitNil(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNilWhere sets optionOmitNilWhere option for the model, which automatically filers
+// the Where/Having parameters for "nil" values.
+func (d *WorkOrderFeedbackDao) OmitNilWhere() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitNilWhere(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNilData sets optionOmitNilData option for the model, which automatically filers
+// the Data parameters for "nil" values.
+func (d *WorkOrderFeedbackDao) OmitNilData() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OmitNilData(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Filter marks filtering the fields which does not exist in the fields of the operated table.
+// Note that this function supports only single table operations.
+// Deprecated, filter feature is automatically enabled from GoFrame v1.16.0, it is so no longer used.
+func (d *WorkOrderFeedbackDao) Filter() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Filter(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Where sets the condition statement for the model. The parameter <where> can be type of
+// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
+// multiple conditions will be joined into where statement using "AND".
+// Eg:
+// Where("uid=10000")
+// Where("uid", 10000)
+// Where("money>? AND name like ?", 99999, "vip_%")
+// Where("uid", 1).Where("name", "john")
+// Where("status IN (?)", g.Slice{1,2,3})
+// Where("age IN(?,?)", 18, 50)
+// Where(User{ Id : 1, UserName : "john"})
+func (d *WorkOrderFeedbackDao) Where(where interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Where(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WherePri does the same logic as M.Where except that if the parameter <where>
+// is a single condition like int/string/float/slice, it treats the condition as the primary
+// key value. That is, if primary key is "id" and given <where> parameter as "123", the
+// WherePri function treats the condition as "id=123", but M.Where treats the condition
+// as string "123".
+func (d *WorkOrderFeedbackDao) WherePri(where interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WherePri(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Having sets the having statement for the model.
+// The parameters of this function usage are as the same as function Where.
+// See Where.
+func (d *WorkOrderFeedbackDao) Having(having interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Having(having, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Wheref builds condition string using fmt.Sprintf and arguments.
+// Note that if the number of "args" is more than the place holder in "format",
+// the extra "args" will be used as the where condition arguments of the Model.
+func (d *WorkOrderFeedbackDao) Wheref(format string, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Wheref(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLT builds "column < value" statement.
+func (d *WorkOrderFeedbackDao) WhereLT(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLTE builds "column <= value" statement.
+func (d *WorkOrderFeedbackDao) WhereLTE(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGT builds "column > value" statement.
+func (d *WorkOrderFeedbackDao) WhereGT(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGTE builds "column >= value" statement.
+func (d *WorkOrderFeedbackDao) WhereGTE(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereGTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereBetween builds "column BETWEEN min AND max" statement.
+func (d *WorkOrderFeedbackDao) WhereBetween(column string, min, max interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLike builds "column LIKE like" statement.
+func (d *WorkOrderFeedbackDao) WhereLike(column string, like interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereIn builds "column IN (in)" statement.
+func (d *WorkOrderFeedbackDao) WhereIn(column string, in interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNull builds "columns[0] IS NULL AND columns[1] IS NULL ..." statement.
+func (d *WorkOrderFeedbackDao) WhereNull(columns ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotBetween builds "column NOT BETWEEN min AND max" statement.
+func (d *WorkOrderFeedbackDao) WhereNotBetween(column string, min, max interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNotBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotLike builds "column NOT LIKE like" statement.
+func (d *WorkOrderFeedbackDao) WhereNotLike(column string, like interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNot builds "column != value" statement.
+func (d *WorkOrderFeedbackDao) WhereNot(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNot(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotIn builds "column NOT IN (in)" statement.
+func (d *WorkOrderFeedbackDao) WhereNotIn(column string, in interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNotIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotNull builds "columns[0] IS NOT NULL AND columns[1] IS NOT NULL ..." statement.
+func (d *WorkOrderFeedbackDao) WhereNotNull(columns ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOr adds "OR" condition to the where statement.
+func (d *WorkOrderFeedbackDao) WhereOr(where interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOr(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrf builds "OR" condition string using fmt.Sprintf and arguments.
+func (d *WorkOrderFeedbackDao) WhereOrf(format string, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrf(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLT builds "column < value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackDao) WhereOrLT(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLTE builds "column <= value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackDao) WhereOrLTE(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGT builds "column > value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackDao) WhereOrGT(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGTE builds "column >= value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackDao) WhereOrGTE(column string, value interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrGTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrBetween builds "column BETWEEN min AND max" statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrBetween(column string, min, max interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLike builds "column LIKE like" statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrLike(column string, like interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrIn builds "column IN (in)" statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrIn(column string, in interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNull builds "columns[0] IS NULL OR columns[1] IS NULL ..." statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrNull(columns ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotBetween builds "column NOT BETWEEN min AND max" statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrNotBetween(column string, min, max interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrNotBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotLike builds "column NOT LIKE like" statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrNotLike(column string, like interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotIn builds "column NOT IN (in)" statement.
+func (d *WorkOrderFeedbackDao) WhereOrNotIn(column string, in interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrNotIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotNull builds "columns[0] IS NOT NULL OR columns[1] IS NOT NULL ..." statement in "OR" conditions.
+func (d *WorkOrderFeedbackDao) WhereOrNotNull(columns ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.WhereOrNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Group sets the "GROUP BY" statement for the model.
+func (d *WorkOrderFeedbackDao) Group(groupBy ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Group(groupBy...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// And adds "AND" condition to the where statement.
+// Deprecated, use Where instead.
+func (d *WorkOrderFeedbackDao) And(where interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.And(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Or adds "OR" condition to the where statement.
+// Deprecated, use WhereOr instead.
+func (d *WorkOrderFeedbackDao) Or(where interface{}, args ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Or(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// GroupBy sets the "GROUP BY" statement for the model.
+func (d *WorkOrderFeedbackDao) GroupBy(groupBy string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Group(groupBy), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Order sets the "ORDER BY" statement for the model.
+func (d *WorkOrderFeedbackDao) Order(orderBy ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Order(orderBy...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderAsc sets the "ORDER BY xxx ASC" statement for the model.
+func (d *WorkOrderFeedbackDao) OrderAsc(column string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OrderAsc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderDesc sets the "ORDER BY xxx DESC" statement for the model.
+func (d *WorkOrderFeedbackDao) OrderDesc(column string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OrderDesc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderRandom sets the "ORDER BY RANDOM()" statement for the model.
+func (d *WorkOrderFeedbackDao) OrderRandom() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.OrderRandom(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderBy is alias of Model.Order.
+// See Model.Order.
+// Deprecated, use Order instead.
+func (d *WorkOrderFeedbackDao) OrderBy(orderBy string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Order(orderBy), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Limit sets the "LIMIT" statement for the model.
+// The parameter <limit> can be either one or two number, if passed two number is passed,
+// it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"
+// statement.
+func (d *WorkOrderFeedbackDao) Limit(limit ...int) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Limit(limit...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Offset sets the "OFFSET" statement for the model.
+// It only makes sense for some databases like SQLServer, PostgreSQL, etc.
+func (d *WorkOrderFeedbackDao) Offset(offset int) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Offset(offset), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Distinct forces the query to only return distinct results.
+func (d *WorkOrderFeedbackDao) Distinct() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Distinct(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Page sets the paging number for the model.
+// The parameter <page> is started from 1 for paging.
+// Note that, it differs that the Limit function start from 0 for "LIMIT" statement.
+func (d *WorkOrderFeedbackDao) Page(page, limit int) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Page(page, limit), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Batch sets the batch operation number for the model.
+func (d *WorkOrderFeedbackDao) Batch(batch int) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Batch(batch), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Cache sets the cache feature for the model. It caches the result of the sql, which means
+// if there's another same sql request, it just reads and returns the result from cache, it
+// but not committed and executed into the database.
+//
+// If the parameter <duration> < 0, which means it clear the cache with given <name>.
+// If the parameter <duration> = 0, which means it never expires.
+// If the parameter <duration> > 0, which means it expires after <duration>.
+//
+// The optional parameter <name> is used to bind a name to the cache, which means you can later
+// control the cache like changing the <duration> or clearing the cache with specified <name>.
+//
+// Note that, the cache feature is disabled if the model is operating on a transaction.
+func (d *WorkOrderFeedbackDao) Cache(duration time.Duration, name ...string) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Cache(duration, name...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Data sets the operation data for the model.
+// The parameter <data> can be type of string/map/gmap/slice/struct/*struct, etc.
+// Eg:
+// Data("uid=10000")
+// Data("uid", 10000)
+// Data(g.Map{"uid": 10000, "name":"john"})
+// Data(g.Slice{g.Map{"uid": 10000, "name":"john"}, g.Map{"uid": 20000, "name":"smith"})
+func (d *WorkOrderFeedbackDao) Data(data ...interface{}) *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Data(data...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// All does "SELECT FROM ..." statement for the model.
+// It retrieves the records from table and returns the result as []*model.WorkOrderFeedback.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *WorkOrderFeedbackDao) All(where ...interface{}) ([]*model.WorkOrderFeedback, error) {
+	all, err := d.M.All(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.WorkOrderFeedback
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// One retrieves one record from table and returns the result as *model.WorkOrderFeedback.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *WorkOrderFeedbackDao) One(where ...interface{}) (*model.WorkOrderFeedback, error) {
+	one, err := d.M.One(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.WorkOrderFeedback
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindOne retrieves and returns a single Record by M.WherePri and M.One.
+// Also see M.WherePri and M.One.
+func (d *WorkOrderFeedbackDao) FindOne(where ...interface{}) (*model.WorkOrderFeedback, error) {
+	one, err := d.M.FindOne(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.WorkOrderFeedback
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindAll retrieves and returns Result by by M.WherePri and M.All.
+// Also see M.WherePri and M.All.
+func (d *WorkOrderFeedbackDao) FindAll(where ...interface{}) ([]*model.WorkOrderFeedback, error) {
+	all, err := d.M.FindAll(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.WorkOrderFeedback
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// Struct retrieves one record from table and converts it into given struct.
+// The parameter <pointer> should be type of *struct/**struct. If type **struct is given,
+// it can create the struct internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not nil.
+//
+// Eg:
+// user := new(User)
+// err  := dao.User.Where("id", 1).Struct(user)
+//
+// user := (*User)(nil)
+// err  := dao.User.Where("id", 1).Struct(&user)
+func (d *WorkOrderFeedbackDao) Struct(pointer interface{}, where ...interface{}) error {
+	return d.M.Struct(pointer, where...)
+}
+
+// Structs retrieves records from table and converts them into given struct slice.
+// The parameter <pointer> should be type of *[]struct/*[]*struct. It can create and fill the struct
+// slice internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not empty.
+//
+// Eg:
+// users := ([]User)(nil)
+// err   := dao.User.Structs(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Structs(&users)
+func (d *WorkOrderFeedbackDao) Structs(pointer interface{}, where ...interface{}) error {
+	return d.M.Structs(pointer, where...)
+}
+
+// Scan automatically calls Struct or Structs function according to the type of parameter <pointer>.
+// It calls function Struct if <pointer> is type of *struct/**struct.
+// It calls function Structs if <pointer> is type of *[]struct/*[]*struct.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved and given pointer is not empty or nil.
+//
+// Eg:
+// user  := new(User)
+// err   := dao.User.Where("id", 1).Scan(user)
+//
+// user  := (*User)(nil)
+// err   := dao.User.Where("id", 1).Scan(&user)
+//
+// users := ([]User)(nil)
+// err   := dao.User.Scan(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Scan(&users)
+func (d *WorkOrderFeedbackDao) Scan(pointer interface{}, where ...interface{}) error {
+	return d.M.Scan(pointer, where...)
+}
+
+// Chunk iterates the table with given size and callback function.
+func (d *WorkOrderFeedbackDao) Chunk(limit int, callback func(entities []*model.WorkOrderFeedback, err error) bool) {
+	d.M.Chunk(limit, func(result gdb.Result, err error) bool {
+		var entities []*model.WorkOrderFeedback
+		err = result.Structs(&entities)
+		if err == sql.ErrNoRows {
+			return false
+		}
+		return callback(entities, err)
+	})
+}
+
+// LockUpdate sets the lock for update for current operation.
+func (d *WorkOrderFeedbackDao) LockUpdate() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.LockUpdate(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// LockShared sets the lock in share mode for current operation.
+func (d *WorkOrderFeedbackDao) LockShared() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.LockShared(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Unscoped enables/disables the soft deleting feature.
+func (d *WorkOrderFeedbackDao) Unscoped() *WorkOrderFeedbackDao {
+	return &WorkOrderFeedbackDao{M: d.M.Unscoped(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// DataScope enables the DataScope feature.
+func (d *WorkOrderFeedbackDao) DataScope(ctx context.Context, userCol ...string) *WorkOrderFeedbackDao {
+	cs := ctx.Value("contextService")
+	dataScope := gconv.Map(gconv.String(gconv.Map(cs)["dataScope"]))
+	if dataScope != nil {
+		tableAs := d.TableAs
+		if d.TableAs != "" {
+			tableAs += "."
+		}
+		userIds, ok := dataScope["userIds"]
+		delete(dataScope, "userIds")
+		var orColumns []string
+		var orValues []interface{}
+		if ok && userIds != "-1" {
+			column := "created_by"
+			if len(userCol) == 1 {
+				column = userCol[0]
+			}
+			if ok, _ := d.M.HasField(column); ok {
+				orColumns = append(orColumns, tableAs+column+" IN (?) ")
+				orValues = append(orValues, userIds)
+			}
+		}
+		// 销售工程师判断
+		var salesEngineerFlag bool
+		if roles, ok := dataScope["roles"]; ok {
+			arr := garray.NewArrayFrom(roles.([]interface{}), true)
+			if arr.Len() == 1 && arr.Contains("SalesEngineer") {
+				salesEngineerFlag = true
+			}
+		}
+		// 非销售工程师权限加成
+		if !salesEngineerFlag {
+			bigColumns := "is_big"
+			if ok, _ := d.M.HasField("is_big"); ok {
+				if val, ok := dataScope[bigColumns]; ok && val != "" {
+					orColumns = append(orColumns, tableAs+bigColumns+" = ? ")
+					orValues = append(orValues, val)
+				}
+				delete(dataScope, bigColumns)
+			}
+			var andColumns []string
+			var andValues []interface{}
+			for k, v := range dataScope {
+				if ok, _ := d.M.HasField(k); ok {
+					andColumns = append(andColumns, tableAs+k+" IN (?) ")
+					andValues = append(andValues, v)
+				}
+			}
+			if len(andColumns) > 0 {
+				andWhereSql := strings.Join(andColumns, " AND ")
+				orColumns = append(orColumns, "("+andWhereSql+")")
+				orValues = append(orValues, andValues...)
+			}
+		}
+
+		whereSql := strings.Join(orColumns, " OR ")
+		return &WorkOrderFeedbackDao{M: d.M.Where(whereSql, orValues...).Ctx(ctx), Table: d.Table, TableAs: d.TableAs}
+	}
+	return d
+}

+ 747 - 0
opms_parent/app/dao/work/internal/work_order_feedback_file.go

@@ -0,0 +1,747 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+	"database/sql"
+	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/frame/gmvc"
+	"github.com/gogf/gf/util/gconv"
+	"strings"
+	"time"
+
+	model "dashoo.cn/micro/app/model/work"
+)
+
+// WorkOrderFeedbackFileDao is the manager for logic model data accessing and custom defined data operations functions management.
+type WorkOrderFeedbackFileDao struct {
+	gmvc.M                               // M is the core and embedded struct that inherits all chaining operations from gdb.Model.
+	C       workOrderFeedbackFileColumns // C is the short type for Columns, which contains all the column names of Table for convenient usage.
+	DB      gdb.DB                       // DB is the raw underlying database management object.
+	Table   string                       // Table is the underlying table name of the DAO.
+	TableAs string                       // TableAs is the underlying table alias name of the DAO.
+}
+
+// WorkOrderFeedbackFileColumns defines and stores column names for table work_order_feedback_file.
+type workOrderFeedbackFileColumns struct {
+	Id          string // 主键
+	OrderId     string // 关联工单
+	FeebackId   string // 关联反馈
+	File        string // 文件
+	Remark      string // 备注
+	CreatedBy   string // 创建者
+	CreatedName string // 创建人
+	CreatedTime string // 创建时间
+	UpdatedBy   string // 更新者
+	UpdatedName string // 更新人
+	UpdatedTime string // 更新时间
+	DeletedTime string // 删除时间
+}
+
+var (
+	// WorkOrderFeedbackFile is globally public accessible object for table work_order_feedback_file operations.
+	WorkOrderFeedbackFile = WorkOrderFeedbackFileDao{
+		M:     g.DB("default").Model("work_order_feedback_file").Safe(),
+		DB:    g.DB("default"),
+		Table: "work_order_feedback_file",
+		C: workOrderFeedbackFileColumns{
+			Id:          "id",
+			OrderId:     "order_id",
+			FeebackId:   "feeback_id",
+			File:        "file",
+			Remark:      "remark",
+			CreatedBy:   "created_by",
+			CreatedName: "created_name",
+			CreatedTime: "created_time",
+			UpdatedBy:   "updated_by",
+			UpdatedName: "updated_name",
+			UpdatedTime: "updated_time",
+			DeletedTime: "deleted_time",
+		},
+	}
+)
+
+func NewWorkOrderFeedbackFileDao(tenant string) WorkOrderFeedbackFileDao {
+	var dao WorkOrderFeedbackFileDao
+	dao = WorkOrderFeedbackFileDao{
+		M:     g.DB(tenant).Model("work_order_feedback_file").Safe(),
+		DB:    g.DB(tenant),
+		Table: "work_order_feedback_file",
+		C: workOrderFeedbackFileColumns{
+			Id:          "id",
+			OrderId:     "order_id",
+			FeebackId:   "feeback_id",
+			File:        "file",
+			Remark:      "remark",
+			CreatedBy:   "created_by",
+			CreatedName: "created_name",
+			CreatedTime: "created_time",
+			UpdatedBy:   "updated_by",
+			UpdatedName: "updated_name",
+			UpdatedTime: "updated_time",
+			DeletedTime: "deleted_time",
+		},
+	}
+	return dao
+}
+
+// Ctx is a chaining function, which creates and returns a new DB that is a shallow copy
+// of current DB object and with given context in it.
+// Note that this returned DB object can be used only once, so do not assign it to
+// a global or package variable for long using.
+func (d *WorkOrderFeedbackFileDao) Ctx(ctx context.Context) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Ctx(ctx), Table: d.Table, TableAs: d.TableAs}
+}
+
+// GetCtx returns the context for current Model.
+// It returns "context.Background() i"s there's no context previously set.
+func (d *WorkOrderFeedbackFileDao) GetCtx() context.Context {
+	return d.M.GetCtx()
+}
+
+// As sets an alias name for current table.
+func (d *WorkOrderFeedbackFileDao) As(as string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.As(as), Table: d.Table, TableAs: as}
+}
+
+// TX sets the transaction for current operation.
+func (d *WorkOrderFeedbackFileDao) TX(tx *gdb.TX) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.TX(tx), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Master marks the following operation on master node.
+func (d *WorkOrderFeedbackFileDao) Master() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Master(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Slave marks the following operation on slave node.
+// Note that it makes sense only if there's any slave node configured.
+func (d *WorkOrderFeedbackFileDao) Slave() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Slave(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Args sets custom arguments for model operation.
+func (d *WorkOrderFeedbackFileDao) Args(args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Args(args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Handler calls each of "handlers" on current Model and returns a new Model.
+// ModelHandler is a function that handles given Model and returns a new Model that is custom modified.
+func (d *WorkOrderFeedbackFileDao) Handler(handlers ...gdb.ModelHandler) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Handler(handlers...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// LeftJoin does "LEFT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").LeftJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").LeftJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackFileDao) LeftJoin(table ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.LeftJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// RightJoin does "RIGHT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").RightJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").RightJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackFileDao) RightJoin(table ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.RightJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// InnerJoin does "INNER JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").InnerJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").InnerJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *WorkOrderFeedbackFileDao) InnerJoin(table ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.InnerJoin(table...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Fields sets the operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *WorkOrderFeedbackFileDao) Fields(fieldNamesOrMapStruct ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Fields(fieldNamesOrMapStruct...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldsEx sets the excluded operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *WorkOrderFeedbackFileDao) FieldsEx(fieldNamesOrMapStruct ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldsEx(fieldNamesOrMapStruct...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldCount formats and appends commonly used field "COUNT(column)" to the select fields of model.
+func (d *WorkOrderFeedbackFileDao) FieldCount(column string, as ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldCount(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldSum formats and appends commonly used field "SUM(column)" to the select fields of model.
+func (d *WorkOrderFeedbackFileDao) FieldSum(column string, as ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldSum(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldMin formats and appends commonly used field "MIN(column)" to the select fields of model.
+func (d *WorkOrderFeedbackFileDao) FieldMin(column string, as ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldMin(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldMax formats and appends commonly used field "MAX(column)" to the select fields of model.
+func (d *WorkOrderFeedbackFileDao) FieldMax(column string, as ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldMax(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// FieldAvg formats and appends commonly used field "AVG(column)" to the select fields of model.
+func (d *WorkOrderFeedbackFileDao) FieldAvg(column string, as ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.FieldAvg(column, as...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Option adds extra operation option for the model.
+// Deprecated, use separate operations instead.
+func (d *WorkOrderFeedbackFileDao) Option(option int) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Option(option), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
+// the data and where attributes for empty values.
+func (d *WorkOrderFeedbackFileDao) OmitEmpty() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitEmpty(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmptyWhere sets optionOmitEmptyWhere option for the model, which automatically filers
+// the Where/Having parameters for "empty" values.
+func (d *WorkOrderFeedbackFileDao) OmitEmptyWhere() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitEmptyWhere(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitEmptyData sets optionOmitEmptyData option for the model, which automatically filers
+// the Data parameters for "empty" values.
+func (d *WorkOrderFeedbackFileDao) OmitEmptyData() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitEmptyData(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNil sets optionOmitNil option for the model, which automatically filers
+// the data and where parameters for "nil" values.
+func (d *WorkOrderFeedbackFileDao) OmitNil() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitNil(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNilWhere sets optionOmitNilWhere option for the model, which automatically filers
+// the Where/Having parameters for "nil" values.
+func (d *WorkOrderFeedbackFileDao) OmitNilWhere() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitNilWhere(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OmitNilData sets optionOmitNilData option for the model, which automatically filers
+// the Data parameters for "nil" values.
+func (d *WorkOrderFeedbackFileDao) OmitNilData() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OmitNilData(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Filter marks filtering the fields which does not exist in the fields of the operated table.
+// Note that this function supports only single table operations.
+// Deprecated, filter feature is automatically enabled from GoFrame v1.16.0, it is so no longer used.
+func (d *WorkOrderFeedbackFileDao) Filter() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Filter(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Where sets the condition statement for the model. The parameter <where> can be type of
+// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
+// multiple conditions will be joined into where statement using "AND".
+// Eg:
+// Where("uid=10000")
+// Where("uid", 10000)
+// Where("money>? AND name like ?", 99999, "vip_%")
+// Where("uid", 1).Where("name", "john")
+// Where("status IN (?)", g.Slice{1,2,3})
+// Where("age IN(?,?)", 18, 50)
+// Where(User{ Id : 1, UserName : "john"})
+func (d *WorkOrderFeedbackFileDao) Where(where interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Where(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WherePri does the same logic as M.Where except that if the parameter <where>
+// is a single condition like int/string/float/slice, it treats the condition as the primary
+// key value. That is, if primary key is "id" and given <where> parameter as "123", the
+// WherePri function treats the condition as "id=123", but M.Where treats the condition
+// as string "123".
+func (d *WorkOrderFeedbackFileDao) WherePri(where interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WherePri(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Having sets the having statement for the model.
+// The parameters of this function usage are as the same as function Where.
+// See Where.
+func (d *WorkOrderFeedbackFileDao) Having(having interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Having(having, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Wheref builds condition string using fmt.Sprintf and arguments.
+// Note that if the number of "args" is more than the place holder in "format",
+// the extra "args" will be used as the where condition arguments of the Model.
+func (d *WorkOrderFeedbackFileDao) Wheref(format string, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Wheref(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLT builds "column < value" statement.
+func (d *WorkOrderFeedbackFileDao) WhereLT(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLTE builds "column <= value" statement.
+func (d *WorkOrderFeedbackFileDao) WhereLTE(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGT builds "column > value" statement.
+func (d *WorkOrderFeedbackFileDao) WhereGT(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGTE builds "column >= value" statement.
+func (d *WorkOrderFeedbackFileDao) WhereGTE(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereGTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereBetween builds "column BETWEEN min AND max" statement.
+func (d *WorkOrderFeedbackFileDao) WhereBetween(column string, min, max interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLike builds "column LIKE like" statement.
+func (d *WorkOrderFeedbackFileDao) WhereLike(column string, like interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereIn builds "column IN (in)" statement.
+func (d *WorkOrderFeedbackFileDao) WhereIn(column string, in interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNull builds "columns[0] IS NULL AND columns[1] IS NULL ..." statement.
+func (d *WorkOrderFeedbackFileDao) WhereNull(columns ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotBetween builds "column NOT BETWEEN min AND max" statement.
+func (d *WorkOrderFeedbackFileDao) WhereNotBetween(column string, min, max interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNotBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotLike builds "column NOT LIKE like" statement.
+func (d *WorkOrderFeedbackFileDao) WhereNotLike(column string, like interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNot builds "column != value" statement.
+func (d *WorkOrderFeedbackFileDao) WhereNot(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNot(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotIn builds "column NOT IN (in)" statement.
+func (d *WorkOrderFeedbackFileDao) WhereNotIn(column string, in interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNotIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotNull builds "columns[0] IS NOT NULL AND columns[1] IS NOT NULL ..." statement.
+func (d *WorkOrderFeedbackFileDao) WhereNotNull(columns ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOr adds "OR" condition to the where statement.
+func (d *WorkOrderFeedbackFileDao) WhereOr(where interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOr(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrf builds "OR" condition string using fmt.Sprintf and arguments.
+func (d *WorkOrderFeedbackFileDao) WhereOrf(format string, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrf(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLT builds "column < value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackFileDao) WhereOrLT(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLTE builds "column <= value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackFileDao) WhereOrLTE(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGT builds "column > value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackFileDao) WhereOrGT(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGTE builds "column >= value" statement in "OR" conditions..
+func (d *WorkOrderFeedbackFileDao) WhereOrGTE(column string, value interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrGTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrBetween builds "column BETWEEN min AND max" statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrBetween(column string, min, max interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLike builds "column LIKE like" statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrLike(column string, like interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrIn builds "column IN (in)" statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrIn(column string, in interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNull builds "columns[0] IS NULL OR columns[1] IS NULL ..." statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrNull(columns ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotBetween builds "column NOT BETWEEN min AND max" statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrNotBetween(column string, min, max interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrNotBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotLike builds "column NOT LIKE like" statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrNotLike(column string, like interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotIn builds "column NOT IN (in)" statement.
+func (d *WorkOrderFeedbackFileDao) WhereOrNotIn(column string, in interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrNotIn(column, in), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotNull builds "columns[0] IS NOT NULL OR columns[1] IS NOT NULL ..." statement in "OR" conditions.
+func (d *WorkOrderFeedbackFileDao) WhereOrNotNull(columns ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.WhereOrNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Group sets the "GROUP BY" statement for the model.
+func (d *WorkOrderFeedbackFileDao) Group(groupBy ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Group(groupBy...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// And adds "AND" condition to the where statement.
+// Deprecated, use Where instead.
+func (d *WorkOrderFeedbackFileDao) And(where interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.And(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Or adds "OR" condition to the where statement.
+// Deprecated, use WhereOr instead.
+func (d *WorkOrderFeedbackFileDao) Or(where interface{}, args ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Or(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// GroupBy sets the "GROUP BY" statement for the model.
+func (d *WorkOrderFeedbackFileDao) GroupBy(groupBy string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Group(groupBy), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Order sets the "ORDER BY" statement for the model.
+func (d *WorkOrderFeedbackFileDao) Order(orderBy ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Order(orderBy...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderAsc sets the "ORDER BY xxx ASC" statement for the model.
+func (d *WorkOrderFeedbackFileDao) OrderAsc(column string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OrderAsc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderDesc sets the "ORDER BY xxx DESC" statement for the model.
+func (d *WorkOrderFeedbackFileDao) OrderDesc(column string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OrderDesc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderRandom sets the "ORDER BY RANDOM()" statement for the model.
+func (d *WorkOrderFeedbackFileDao) OrderRandom() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.OrderRandom(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderBy is alias of Model.Order.
+// See Model.Order.
+// Deprecated, use Order instead.
+func (d *WorkOrderFeedbackFileDao) OrderBy(orderBy string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Order(orderBy), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Limit sets the "LIMIT" statement for the model.
+// The parameter <limit> can be either one or two number, if passed two number is passed,
+// it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"
+// statement.
+func (d *WorkOrderFeedbackFileDao) Limit(limit ...int) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Limit(limit...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Offset sets the "OFFSET" statement for the model.
+// It only makes sense for some databases like SQLServer, PostgreSQL, etc.
+func (d *WorkOrderFeedbackFileDao) Offset(offset int) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Offset(offset), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Distinct forces the query to only return distinct results.
+func (d *WorkOrderFeedbackFileDao) Distinct() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Distinct(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Page sets the paging number for the model.
+// The parameter <page> is started from 1 for paging.
+// Note that, it differs that the Limit function start from 0 for "LIMIT" statement.
+func (d *WorkOrderFeedbackFileDao) Page(page, limit int) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Page(page, limit), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Batch sets the batch operation number for the model.
+func (d *WorkOrderFeedbackFileDao) Batch(batch int) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Batch(batch), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Cache sets the cache feature for the model. It caches the result of the sql, which means
+// if there's another same sql request, it just reads and returns the result from cache, it
+// but not committed and executed into the database.
+//
+// If the parameter <duration> < 0, which means it clear the cache with given <name>.
+// If the parameter <duration> = 0, which means it never expires.
+// If the parameter <duration> > 0, which means it expires after <duration>.
+//
+// The optional parameter <name> is used to bind a name to the cache, which means you can later
+// control the cache like changing the <duration> or clearing the cache with specified <name>.
+//
+// Note that, the cache feature is disabled if the model is operating on a transaction.
+func (d *WorkOrderFeedbackFileDao) Cache(duration time.Duration, name ...string) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Cache(duration, name...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Data sets the operation data for the model.
+// The parameter <data> can be type of string/map/gmap/slice/struct/*struct, etc.
+// Eg:
+// Data("uid=10000")
+// Data("uid", 10000)
+// Data(g.Map{"uid": 10000, "name":"john"})
+// Data(g.Slice{g.Map{"uid": 10000, "name":"john"}, g.Map{"uid": 20000, "name":"smith"})
+func (d *WorkOrderFeedbackFileDao) Data(data ...interface{}) *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Data(data...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// All does "SELECT FROM ..." statement for the model.
+// It retrieves the records from table and returns the result as []*model.WorkOrderFeedbackFile.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *WorkOrderFeedbackFileDao) All(where ...interface{}) ([]*model.WorkOrderFeedbackFile, error) {
+	all, err := d.M.All(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.WorkOrderFeedbackFile
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// One retrieves one record from table and returns the result as *model.WorkOrderFeedbackFile.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *WorkOrderFeedbackFileDao) One(where ...interface{}) (*model.WorkOrderFeedbackFile, error) {
+	one, err := d.M.One(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.WorkOrderFeedbackFile
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindOne retrieves and returns a single Record by M.WherePri and M.One.
+// Also see M.WherePri and M.One.
+func (d *WorkOrderFeedbackFileDao) FindOne(where ...interface{}) (*model.WorkOrderFeedbackFile, error) {
+	one, err := d.M.FindOne(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.WorkOrderFeedbackFile
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindAll retrieves and returns Result by by M.WherePri and M.All.
+// Also see M.WherePri and M.All.
+func (d *WorkOrderFeedbackFileDao) FindAll(where ...interface{}) ([]*model.WorkOrderFeedbackFile, error) {
+	all, err := d.M.FindAll(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.WorkOrderFeedbackFile
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// Struct retrieves one record from table and converts it into given struct.
+// The parameter <pointer> should be type of *struct/**struct. If type **struct is given,
+// it can create the struct internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not nil.
+//
+// Eg:
+// user := new(User)
+// err  := dao.User.Where("id", 1).Struct(user)
+//
+// user := (*User)(nil)
+// err  := dao.User.Where("id", 1).Struct(&user)
+func (d *WorkOrderFeedbackFileDao) Struct(pointer interface{}, where ...interface{}) error {
+	return d.M.Struct(pointer, where...)
+}
+
+// Structs retrieves records from table and converts them into given struct slice.
+// The parameter <pointer> should be type of *[]struct/*[]*struct. It can create and fill the struct
+// slice internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not empty.
+//
+// Eg:
+// users := ([]User)(nil)
+// err   := dao.User.Structs(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Structs(&users)
+func (d *WorkOrderFeedbackFileDao) Structs(pointer interface{}, where ...interface{}) error {
+	return d.M.Structs(pointer, where...)
+}
+
+// Scan automatically calls Struct or Structs function according to the type of parameter <pointer>.
+// It calls function Struct if <pointer> is type of *struct/**struct.
+// It calls function Structs if <pointer> is type of *[]struct/*[]*struct.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved and given pointer is not empty or nil.
+//
+// Eg:
+// user  := new(User)
+// err   := dao.User.Where("id", 1).Scan(user)
+//
+// user  := (*User)(nil)
+// err   := dao.User.Where("id", 1).Scan(&user)
+//
+// users := ([]User)(nil)
+// err   := dao.User.Scan(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Scan(&users)
+func (d *WorkOrderFeedbackFileDao) Scan(pointer interface{}, where ...interface{}) error {
+	return d.M.Scan(pointer, where...)
+}
+
+// Chunk iterates the table with given size and callback function.
+func (d *WorkOrderFeedbackFileDao) Chunk(limit int, callback func(entities []*model.WorkOrderFeedbackFile, err error) bool) {
+	d.M.Chunk(limit, func(result gdb.Result, err error) bool {
+		var entities []*model.WorkOrderFeedbackFile
+		err = result.Structs(&entities)
+		if err == sql.ErrNoRows {
+			return false
+		}
+		return callback(entities, err)
+	})
+}
+
+// LockUpdate sets the lock for update for current operation.
+func (d *WorkOrderFeedbackFileDao) LockUpdate() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.LockUpdate(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// LockShared sets the lock in share mode for current operation.
+func (d *WorkOrderFeedbackFileDao) LockShared() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.LockShared(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Unscoped enables/disables the soft deleting feature.
+func (d *WorkOrderFeedbackFileDao) Unscoped() *WorkOrderFeedbackFileDao {
+	return &WorkOrderFeedbackFileDao{M: d.M.Unscoped(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// DataScope enables the DataScope feature.
+func (d *WorkOrderFeedbackFileDao) DataScope(ctx context.Context, userCol ...string) *WorkOrderFeedbackFileDao {
+	cs := ctx.Value("contextService")
+	dataScope := gconv.Map(gconv.String(gconv.Map(cs)["dataScope"]))
+	if dataScope != nil {
+		tableAs := d.TableAs
+		if d.TableAs != "" {
+			tableAs += "."
+		}
+		userIds, ok := dataScope["userIds"]
+		delete(dataScope, "userIds")
+		var orColumns []string
+		var orValues []interface{}
+		if ok && userIds != "-1" {
+			column := "created_by"
+			if len(userCol) == 1 {
+				column = userCol[0]
+			}
+			if ok, _ := d.M.HasField(column); ok {
+				orColumns = append(orColumns, tableAs+column+" IN (?) ")
+				orValues = append(orValues, userIds)
+			}
+		}
+		// 销售工程师判断
+		var salesEngineerFlag bool
+		if roles, ok := dataScope["roles"]; ok {
+			arr := garray.NewArrayFrom(roles.([]interface{}), true)
+			if arr.Len() == 1 && arr.Contains("SalesEngineer") {
+				salesEngineerFlag = true
+			}
+		}
+		// 非销售工程师权限加成
+		if !salesEngineerFlag {
+			bigColumns := "is_big"
+			if ok, _ := d.M.HasField("is_big"); ok {
+				if val, ok := dataScope[bigColumns]; ok && val != "" {
+					orColumns = append(orColumns, tableAs+bigColumns+" = ? ")
+					orValues = append(orValues, val)
+				}
+				delete(dataScope, bigColumns)
+			}
+			var andColumns []string
+			var andValues []interface{}
+			for k, v := range dataScope {
+				if ok, _ := d.M.HasField(k); ok {
+					andColumns = append(andColumns, tableAs+k+" IN (?) ")
+					andValues = append(andValues, v)
+				}
+			}
+			if len(andColumns) > 0 {
+				andWhereSql := strings.Join(andColumns, " AND ")
+				orColumns = append(orColumns, "("+andWhereSql+")")
+				orValues = append(orValues, andValues...)
+			}
+		}
+
+		whereSql := strings.Join(orColumns, " OR ")
+		return &WorkOrderFeedbackFileDao{M: d.M.Where(whereSql, orValues...).Ctx(ctx), Table: d.Table, TableAs: d.TableAs}
+	}
+	return d
+}

+ 40 - 37
opms_parent/app/dao/work/internal/work_order_type.go

@@ -29,18 +29,19 @@ type WorkOrderTypeDao struct {
 
 // WorkOrderTypeColumns defines and stores column names for table work_order_type.
 type workOrderTypeColumns struct {
-	Id          string // 主键
-	Desc        string // 描述
-	WorkflowId  string // 关联流程
-	FormId      string // 关联表单
-	Remark      string // 备注
-	CreatedBy   string // 创建者
-	CreatedName string // 创建人
-	CreatedTime string // 创建时间
-	UpdatedBy   string // 更新者
-	UpdatedName string // 更新人
-	UpdatedTime string // 更新时间
-	DeletedTime string // 删除时间
+	Id           string // 主键
+	Name         string // 名称
+	WorkflowCode string // 关联流程
+	FormColumn   string // 关联表单
+	Sort         string // 排序
+	Remark       string // 备注
+	CreatedBy    string // 创建者
+	CreatedName  string // 创建人
+	CreatedTime  string // 创建时间
+	UpdatedBy    string // 更新者
+	UpdatedName  string // 更新人
+	UpdatedTime  string // 更新时间
+	DeletedTime  string // 删除时间
 }
 
 var (
@@ -50,18 +51,19 @@ var (
 		DB:    g.DB("default"),
 		Table: "work_order_type",
 		C: workOrderTypeColumns{
-			Id:          "id",
-			Desc:        "desc",
-			WorkflowId:  "workflow_id",
-			FormId:      "form_id",
-			Remark:      "remark",
-			CreatedBy:   "created_by",
-			CreatedName: "created_name",
-			CreatedTime: "created_time",
-			UpdatedBy:   "updated_by",
-			UpdatedName: "updated_name",
-			UpdatedTime: "updated_time",
-			DeletedTime: "deleted_time",
+			Id:           "id",
+			Name:         "name",
+			WorkflowCode: "workflow_code",
+			FormColumn:   "form_column",
+			Sort:         "sort",
+			Remark:       "remark",
+			CreatedBy:    "created_by",
+			CreatedName:  "created_name",
+			CreatedTime:  "created_time",
+			UpdatedBy:    "updated_by",
+			UpdatedName:  "updated_name",
+			UpdatedTime:  "updated_time",
+			DeletedTime:  "deleted_time",
 		},
 	}
 )
@@ -73,18 +75,19 @@ func NewWorkOrderTypeDao(tenant string) WorkOrderTypeDao {
 		DB:    g.DB(tenant),
 		Table: "work_order_type",
 		C: workOrderTypeColumns{
-			Id:          "id",
-			Desc:        "desc",
-			WorkflowId:  "workflow_id",
-			FormId:      "form_id",
-			Remark:      "remark",
-			CreatedBy:   "created_by",
-			CreatedName: "created_name",
-			CreatedTime: "created_time",
-			UpdatedBy:   "updated_by",
-			UpdatedName: "updated_name",
-			UpdatedTime: "updated_time",
-			DeletedTime: "deleted_time",
+			Id:           "id",
+			Name:         "name",
+			WorkflowCode: "workflow_code",
+			FormColumn:   "form_column",
+			Sort:         "sort",
+			Remark:       "remark",
+			CreatedBy:    "created_by",
+			CreatedName:  "created_name",
+			CreatedTime:  "created_time",
+			UpdatedBy:    "updated_by",
+			UpdatedName:  "updated_name",
+			UpdatedTime:  "updated_time",
+			DeletedTime:  "deleted_time",
 		},
 	}
 	return dao
@@ -687,7 +690,7 @@ func (d *WorkOrderTypeDao) Unscoped() *WorkOrderTypeDao {
 // DataScope enables the DataScope feature.
 func (d *WorkOrderTypeDao) DataScope(ctx context.Context, userCol ...string) *WorkOrderTypeDao {
 	cs := ctx.Value("contextService")
-	dataScope := gconv.Map(cs)["dataScope"].(g.Map)
+	dataScope := gconv.Map(gconv.String(gconv.Map(cs)["dataScope"]))
 	if dataScope != nil {
 		tableAs := d.TableAs
 		if d.TableAs != "" {

+ 36 - 0
opms_parent/app/dao/work/work_order_feedback.go

@@ -0,0 +1,36 @@
+// ============================================================================
+// This is auto-generated by gf cli tool only once. Fill this file as you wish.
+// ============================================================================
+
+package work
+
+import (
+	"dashoo.cn/micro/app/dao/work/internal"
+)
+
+// workOrderFeedbackDao is the manager for logic model data accessing
+// and custom defined data operations functions management. You can define
+// methods on it to extend its functionality as you wish.
+type workOrderFeedbackDao struct {
+	internal.WorkOrderFeedbackDao
+}
+
+var (
+	// WorkOrderFeedback is globally public accessible object for table work_order_feedback operations.
+	WorkOrderFeedback = workOrderFeedbackDao{
+		internal.WorkOrderFeedback,
+	}
+)
+
+type WorkOrderFeedbackDao struct {
+	internal.WorkOrderFeedbackDao
+}
+
+func NewWorkOrderFeedbackDao(tenant string) *WorkOrderFeedbackDao {
+	dao := internal.NewWorkOrderFeedbackDao(tenant)
+	return &WorkOrderFeedbackDao{
+		dao,
+	}
+}
+
+// Fill with you ideas below.

+ 36 - 0
opms_parent/app/dao/work/work_order_feedback_file.go

@@ -0,0 +1,36 @@
+// ============================================================================
+// This is auto-generated by gf cli tool only once. Fill this file as you wish.
+// ============================================================================
+
+package work
+
+import (
+	"dashoo.cn/micro/app/dao/work/internal"
+)
+
+// workOrderFeedbackFileDao is the manager for logic model data accessing
+// and custom defined data operations functions management. You can define
+// methods on it to extend its functionality as you wish.
+type workOrderFeedbackFileDao struct {
+	internal.WorkOrderFeedbackFileDao
+}
+
+var (
+	// WorkOrderFeedbackFile is globally public accessible object for table work_order_feedback_file operations.
+	WorkOrderFeedbackFile = workOrderFeedbackFileDao{
+		internal.WorkOrderFeedbackFile,
+	}
+)
+
+type WorkOrderFeedbackFileDao struct {
+	internal.WorkOrderFeedbackFileDao
+}
+
+func NewWorkOrderFeedbackFileDao(tenant string) *WorkOrderFeedbackFileDao {
+	dao := internal.NewWorkOrderFeedbackFileDao(tenant)
+	return &WorkOrderFeedbackFileDao{
+		dao,
+	}
+}
+
+// Fill with you ideas below.

+ 4 - 0
opms_parent/app/handler/proj/business.go

@@ -208,8 +208,12 @@ func (p *BusinessHandler) BusinessUpgradeA(ctx context.Context, args *multipart.
 	}
 	err = businessService.BusinessUpgrade(req, args)
 	if err != nil {
+		rsp.Code = 500
+		rsp.Msg = "系统异常"
 		return err
 	}
+	rsp.Code = 200
+	rsp.Msg = "操作成功"
 	return nil
 }
 

+ 119 - 10
opms_parent/app/handler/work/work_order.go

@@ -2,12 +2,16 @@ package work
 
 import (
 	"context"
+	"dashoo.cn/opms_libary/multipart"
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/util/gvalid"
 
 	"dashoo.cn/common_definition/comm_def"
 	"github.com/gogf/gf/frame/g"
 
 	model "dashoo.cn/micro/app/model/work"
-	server "dashoo.cn/micro/app/service/work"
+	workSrv "dashoo.cn/micro/app/service/work"
 )
 
 type WorkOrderHandler struct{}
@@ -15,11 +19,11 @@ type WorkOrderHandler struct{}
 // Swagger:WorkOrder 工单,测试tag 工单列表
 func (w *WorkOrderHandler) GetList(ctx context.Context, req *model.WorkOrderSearchReq, rsp *comm_def.CommonMsg) error {
 
-	orderServer, err := server.NewOrderService(ctx)
+	orderService, err := workSrv.NewOrderService(ctx)
 	if err != nil {
 		return err
 	}
-	total, list, err := orderServer.GetList(req)
+	total, list, err := orderService.GetList(req)
 	if err != nil {
 		return err
 	}
@@ -28,13 +32,13 @@ func (w *WorkOrderHandler) GetList(ctx context.Context, req *model.WorkOrderSear
 
 }
 
-//导出
+// 导出
 func (w *WorkOrderHandler) DeriveList(ctx context.Context, req *model.WorkOrderExport, rsp *comm_def.CommonMsg) error {
-	orderServer, err := server.NewOrderService(ctx)
+	orderService, err := workSrv.NewOrderService(ctx)
 	if err != nil {
 		return err
 	}
-	con, err := orderServer.DeriveList(req)
+	con, err := orderService.DeriveList(req)
 	if err != nil {
 		return err
 	}
@@ -43,17 +47,122 @@ func (w *WorkOrderHandler) DeriveList(ctx context.Context, req *model.WorkOrderE
 
 }
 
-//工单详情
+// 工单详情
 func (w *WorkOrderHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
-	orderServer, err := server.NewOrderService(ctx)
+	orderService, err := workSrv.NewOrderService(ctx)
 	if err != nil {
 		return err
 	}
-	detail, err := orderServer.GetEntityById(req)
+	detail, err := orderService.GetEntityById(req)
 	if err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"list": detail}
+	rsp.Data = detail
 	return nil
+}
+
+func (w *WorkOrderHandler) UpdateById(ctx context.Context, req *model.UpdateWorkOrderReq, rsp *comm_def.CommonMsg) error {
+	orderService, err := workSrv.NewOrderService(ctx)
+	if err != nil {
+		return err
+	}
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	err = orderService.UpdateById(req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// 创建工单
+func (w *WorkOrderHandler) CreateWorkOrder(ctx context.Context, req *model.WorkOrderReq, rsp *comm_def.CommonMsg) error {
+	orderService, err := workSrv.NewOrderService(ctx)
+	if err != nil {
+		return err
+	}
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	err = orderService.CreateWorkOrder(req, nil)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// 创建上传文件工单
+func (w *WorkOrderHandler) CreateUploadFileOrder(ctx context.Context, args *multipart.MultipartFile, rsp *comm_def.CommonMsg) error {
+	orderService, err := workSrv.NewOrderService(ctx)
+	if err != nil {
+		return err
+	}
+	req := new(model.WorkOrderReq)
+	if err := gconv.Struct(args.Meta, req); err != nil {
+		return err
+	}
+	itemDatas := make([]model.DingTalkFormItemData, 0)
+	data := gconv.Maps(args.Meta["dingTalkFormData"])
+	if err := gconv.Structs(data, &itemDatas); err != nil {
+		return err
+	}
 
+	req.FormData = itemDatas
+	// 参数校验
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	if args.FileName == "" {
+		return myerrors.TipsError("文件名称不能为空")
+	}
+	if args.File == nil {
+		return myerrors.TipsError("文件不能为空")
+	}
+	if args.File.Name() == "" {
+		return myerrors.TipsError("文件路径不能为空")
+	}
+
+	err = orderService.CreateWorkOrder(req, args)
+	if err != nil {
+		rsp.Code = 500
+		rsp.Msg = "系统异常"
+		return err
+	}
+	rsp.Code = 200
+	rsp.Msg = "操作成功"
+	return nil
+}
+
+// 创建工单反馈
+func (w *WorkOrderHandler) CreateWorkOrderFeedback(ctx context.Context, req *model.WorkOrderFeedbackReq, rsp *comm_def.CommonMsg) error {
+	orderService, err := workSrv.NewOrderService(ctx)
+	if err != nil {
+		return err
+	}
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	err = orderService.CreateWorkOrderFeedback(req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// GetWorkOrderFeedbackByDay 反馈记录详情展示,按日期返回前端结果
+func (w *WorkOrderHandler) GetWorkOrderFeedbackByDay(ctx context.Context, req *model.WorkOrderFeedbackSearchReq, rsp *comm_def.CommonMsg) error {
+	orderService, err := workSrv.NewOrderService(ctx)
+	if err != nil {
+		return err
+	}
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	list, err := orderService.GetWorkOrderFeedbackByDay(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": list}
+	return nil
 }

+ 106 - 0
opms_parent/app/handler/work/work_order_type.go

@@ -0,0 +1,106 @@
+package work
+
+import (
+	"context"
+	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/work"
+	service "dashoo.cn/micro/app/service/work"
+)
+
+type WorkOrderTypeHandler struct{}
+
+// Swagger:WorkOrderType 工单类型 工单类型列表
+func (w *WorkOrderTypeHandler) GetList(ctx context.Context, req *model.WorkOrderTypeSearchReq, rsp *comm_def.CommonMsg) error {
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+	}
+	total, list, err := typeSrv.GetList(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": list, "total": total}
+	return nil
+
+}
+
+func (w *WorkOrderTypeHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+	}
+	detail, err := typeSrv.GetEntityById(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": detail}
+	return nil
+
+}
+
+func (w *WorkOrderTypeHandler) Create(ctx context.Context, req *model.WorkOrderTypeReq, rsp *comm_def.CommonMsg) error {
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+
+	}
+	err = typeSrv.Create(req)
+	if err != nil {
+
+		return err
+	}
+	return nil
+}
+
+func (w *WorkOrderTypeHandler) UpdateById(ctx context.Context, req *model.UpdateWorkOrderTypeReq, rsp *comm_def.CommonMsg) error {
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+	}
+	err = typeSrv.UpdateById(req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *WorkOrderTypeHandler) DeleteByIds(ctx context.Context, req *comm_def.IdsReq, rsp *comm_def.CommonMsg) error {
+	if len(req.Ids) == 0 {
+		return myerrors.ValidError("参数有误!")
+	}
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+	}
+	err = typeSrv.DeleteByIds(req.Ids)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// SyncDingTalkForm 同步钉钉工单审批流表单
+func (w *WorkOrderTypeHandler) SyncDingTalkForm(ctx context.Context, req *model.WorkOrderTypeReq, rsp *comm_def.CommonMsg) error {
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return err
+	}
+	typeSrv, err := service.NewWorkOrderTypeService(ctx)
+	if err != nil {
+		return err
+	}
+	err = typeSrv.SyncDingTalkForm(req)
+	if err != nil {
+		return err
+	}
+	return nil
+}

+ 8 - 4
opms_parent/app/model/work/internal/work_order.go

@@ -11,12 +11,16 @@ import (
 // WorkOrder is the golang structure for table work_order.
 type WorkOrder struct {
 	Id             int         `orm:"id,primary"       json:"id"`             // 主键
+	Name           string      `orm:"name"             json:"name"`           // 工单名称
+	NboId          int         `orm:"nbo_id"           json:"nboId"`          // 关联项目
+	NboCode        string      `orm:"nbo_code"         json:"nboCode"`        // 项目编码
+	NboName        string      `orm:"nbo_name"         json:"nboName"`        // 项目名称
+	CustId         int         `orm:"cust_id"          json:"custId"`         // 关联客户
+	CustName       string      `orm:"cust_name"        json:"custName"`       // 客户名称
 	OrderTypeId    int         `orm:"order_type_id"    json:"orderTypeId"`    // 工单类型
-	OrderTypeDesc  string      `orm:"order_type_desc"  json:"orderTypeDesc"`  // 工单类型描述
+	OrderTypeName  string      `orm:"order_type_name"  json:"orderTypeName"`  // 工单类型名称
 	OrderStatus    string      `orm:"order_status"     json:"orderStatus"`    // 工单状态(10发起20审批中30审批通过40审批拒绝50关闭)
-	WorkflowId     int         `orm:"workflow_id"      json:"workflowId"`     // 关联工作流
-	FormId         int         `orm:"form_id"          json:"formId"`         // 关联表单
-	FormData       string      `orm:"form_data"        json:"formData"`       // 表单信息
+	FormData       string      `orm:"form_data"        json:"formData"`       // 表单数据
 	AssignUserId   int         `orm:"assign_user_id"   json:"assignUserId"`   // 分派人员ID
 	AssignUserName string      `orm:"assign_user_name" json:"assignUserName"` // 分派人员姓名
 	Feedback       string      `orm:"feedback"         json:"feedback"`       // 反馈信息

+ 27 - 0
opms_parent/app/model/work/internal/work_order_feedback.go

@@ -0,0 +1,27 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"github.com/gogf/gf/os/gtime"
+)
+
+// WorkOrderFeedback is the golang structure for table work_order_feedback.
+type WorkOrderFeedback struct {
+	Id          int         `orm:"id,primary"    json:"id"`          // 主键
+	OrderId     int         `orm:"order_id"      json:"orderId"`     // 关联工单
+	FeePeopleId int         `orm:"fee_people_id" json:"feePeopleId"` // 反馈人ID
+	FeePeople   string      `orm:"fee_people"    json:"feePeople"`   // 反馈人
+	FeeDate     *gtime.Time `orm:"fee_date"      json:"feeDate"`     // 反馈日期
+	Feedback    string      `orm:"feedback"      json:"feedback"`    // 反馈信息
+	Remark      string      `orm:"remark"        json:"remark"`      // 备注
+	CreatedBy   int         `orm:"created_by"    json:"createdBy"`   // 创建者
+	CreatedName string      `orm:"created_name"  json:"createdName"` // 创建人
+	CreatedTime *gtime.Time `orm:"created_time"  json:"createdTime"` // 创建时间
+	UpdatedBy   int         `orm:"updated_by"    json:"updatedBy"`   // 更新者
+	UpdatedName string      `orm:"updated_name"  json:"updatedName"` // 更新人
+	UpdatedTime *gtime.Time `orm:"updated_time"  json:"updatedTime"` // 更新时间
+	DeletedTime *gtime.Time `orm:"deleted_time"  json:"deletedTime"` // 删除时间
+}

+ 25 - 0
opms_parent/app/model/work/internal/work_order_feedback_file.go

@@ -0,0 +1,25 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"github.com/gogf/gf/os/gtime"
+)
+
+// WorkOrderFeedbackFile is the golang structure for table work_order_feedback_file.
+type WorkOrderFeedbackFile struct {
+	Id          int         `orm:"id,primary"   json:"id"`          // 主键
+	OrderId     int         `orm:"order_id"     json:"orderId"`     // 关联工单
+	FeebackId   int         `orm:"feeback_id"   json:"feebackId"`   // 关联反馈
+	File        string      `orm:"file"         json:"file"`        // 文件
+	Remark      string      `orm:"remark"       json:"remark"`      // 备注
+	CreatedBy   int         `orm:"created_by"   json:"createdBy"`   // 创建者
+	CreatedName string      `orm:"created_name" json:"createdName"` // 创建人
+	CreatedTime *gtime.Time `orm:"created_time" json:"createdTime"` // 创建时间
+	UpdatedBy   int         `orm:"updated_by"   json:"updatedBy"`   // 更新者
+	UpdatedName string      `orm:"updated_name" json:"updatedName"` // 更新人
+	UpdatedTime *gtime.Time `orm:"updated_time" json:"updatedTime"` // 更新时间
+	DeletedTime *gtime.Time `orm:"deleted_time" json:"deletedTime"` // 删除时间
+}

+ 13 - 12
opms_parent/app/model/work/internal/work_order_type.go

@@ -10,16 +10,17 @@ import (
 
 // WorkOrderType is the golang structure for table work_order_type.
 type WorkOrderType struct {
-	Id          int         `orm:"id,primary"   json:"id"`          // 主键
-	Desc        string      `orm:"desc"         json:"desc"`        // 描述
-	WorkflowId  int         `orm:"workflow_id"  json:"workflowId"`  // 关联流程
-	FormId      int         `orm:"form_id"      json:"formId"`      // 关联表单
-	Remark      string      `orm:"remark"       json:"remark"`      // 备注
-	CreatedBy   int         `orm:"created_by"   json:"createdBy"`   // 创建者
-	CreatedName string      `orm:"created_name" json:"createdName"` // 创建人
-	CreatedTime *gtime.Time `orm:"created_time" json:"createdTime"` // 创建时间
-	UpdatedBy   int         `orm:"updated_by"   json:"updatedBy"`   // 更新者
-	UpdatedName string      `orm:"updated_name" json:"updatedName"` // 更新人
-	UpdatedTime *gtime.Time `orm:"updated_time" json:"updatedTime"` // 更新时间
-	DeletedTime *gtime.Time `orm:"deleted_time" json:"deletedTime"` // 删除时间
+	Id           int         `orm:"id,primary"    json:"id"`           // 主键
+	Name         string      `orm:"name"          json:"name"`         // 名称
+	WorkflowCode string      `orm:"workflow_code" json:"workflowCode"` // 关联流程
+	FormColumn   string      `orm:"form_column"   json:"formColumn"`   // 关联表单
+	Sort         int         `orm:"sort"          json:"sort"`         // 排序
+	Remark       string      `orm:"remark"        json:"remark"`       // 备注
+	CreatedBy    int         `orm:"created_by"    json:"createdBy"`    // 创建者
+	CreatedName  string      `orm:"created_name"  json:"createdName"`  // 创建人
+	CreatedTime  *gtime.Time `orm:"created_time"  json:"createdTime"`  // 创建时间
+	UpdatedBy    int         `orm:"updated_by"    json:"updatedBy"`    // 更新者
+	UpdatedName  string      `orm:"updated_name"  json:"updatedName"`  // 更新人
+	UpdatedTime  *gtime.Time `orm:"updated_time"  json:"updatedTime"`  // 更新时间
+	DeletedTime  *gtime.Time `orm:"deleted_time"  json:"deletedTime"`  // 删除时间
 }

+ 60 - 31
opms_parent/app/model/work/work_order.go

@@ -5,10 +5,8 @@
 package work
 
 import (
-	"dashoo.cn/opms_libary/request"
-	"github.com/gogf/gf/os/gtime"
-
 	"dashoo.cn/micro/app/model/work/internal"
+	"dashoo.cn/opms_libary/request"
 )
 
 // WorkOrder is the golang structure for table work_order.
@@ -17,44 +15,75 @@ type WorkOrder internal.WorkOrder
 // Fill with you ideas below.
 
 type WorkOrderSearchReq struct {
-	OrderTypeId    int    `json:"orderTypeId,omitempty"` //工单类型
-	OrderStatus    string `json:"orderStatus"`           //工单状态
-	AssignUserName string `json:"assignUserName"`        // 分派人员姓名
+	NboId          int    `json:"nboId"`          // 主键
+	CustId         int    `json:"custId"`         // 主键
+	NboCode        string `json:"nboCode"`        // 项目编码
+	NboName        string `json:"nboName"`        // 项目名称
+	CustName       string `json:"custName"`       // 客户名称
+	Name           string `json:"name"`           //工单
+	OrderTypeName  string `json:"orderTypeName"`  //工单类型
+	OrderStatus    string `json:"orderStatus"`    //工单状态
+	AssignUserName string `json:"assignUserName"` // 分派人员姓名
+	request.PageReq
+}
+type WorkOrderReq struct {
+	NboId    int    `json:"nboId"`    // 主键
+	NboCode  string `json:"nboCode"`  // 项目编码
+	NboName  string `json:"nboName"`  // 项目名称
+	CustId   int    `json:"custId"`   // 关联客户
+	CustName string `json:"custName"` // 客户名称
+
+	Name           string                 `json:"name"             v:"required#工单名称不能为空"`   // 工单名称
+	OrderTypeId    int                    `json:"orderTypeId"      v:"min:1#工单类型不能为空"`      // 工单类型
+	OrderTypeName  string                 `json:"orderTypeName"    v:"required#工单类型名称不能为空"` // 工单类型名称
+	OrderTypeCode  string                 `json:"orderTypeCode"    v:"required#工单类型编码不能为空"` // 工单类型名称
+	FormData       []DingTalkFormItemData `json:"formData"         v:"required#表单数据不能为空"`   // 表单数据
+	AssignUserId   int                    `json:"assignUserId"     v:"min:1#分派人员不能为空"`      // 分派人员ID
+	AssignUserName string                 `json:"assignUserName"   v:"required#分派人员姓名不能为空"` // 分派人员姓名
+	File           string                 `json:"file"`                                     // 相关文件
+	Remark         string                 `json:"remark"`                                   // 备注
+}
+
+type DingTalkFormItemData struct {
+	Id            string      `json:"id"          v:"required#表单ID不能为空"`
+	Name          string      `json:"name"        v:"required#表单名称不能为空"`
+	Value         interface{} `json:"value"       v:"required#表单值不能为空"`
+	Required      bool        `json:"required"    v:"required#表单必填不能为空"`
+	ComponentName string      `json:"componentName"          v:"required#表单组件不能为空"`
+}
+
+type UpdateWorkOrderReq struct {
+	Id       int    `  json:"id"     v:"min:1#工单不能为空"`      // 主健
+	Feedback string `json:"feedback" v:"required#反馈信息不能为空"` // 反馈信息
+	Remark   string `json:"remark"`                         // 备注
+}
+
+type WorkOrderFeedbackReq struct {
+	OrderId  int    `json:"orderId"     v:"min:1#工单不能为空"`   // 主健
+	Feedback string `json:"feedback" v:"required#反馈信息不能为空"` // 反馈信息
+	Remark   string `json:"remark"`                         // 备注
+}
+
+type WorkOrderFeedbackSearchReq struct {
+	OrderId         int    `json:"orderId"     v:"min:1#工单不能为空"` // 主健
+	FeePeople       string `json:"feePeople"`                    // 反馈人
+	DaysBeforeToday int    `json:"daysBeforeToday"`
 	request.PageReq
 }
 
-//列表返回字段
-type WorkOrderList struct {
-	Id             int         `  json:"id"`             // 主健
-	OrderTypeId    string      `  json:"orderTypeId"`    // 工单类型
-	OrderTypeDesc  string      `  json:"orderTypeDesc"`  // 工单类型描述
-	OrderStatus    string      `  json:"orderStatus"`    // 工单状态
-	AssignUserName string      `  json:"assignUserName"` // 分派人员姓名
-	FeedBack       string      `  json:"feedBack"`       // 反馈信息
-	CreatedName    string      `  json:"createName"`     //创建人
-	CreatedTime    *gtime.Time `  json:"createTime"`     //创建时间
+// 反馈记录详情展示,按日期返回前端结果
+type WorkOrderFeedbackRes struct {
+	FeeDate               string               `json:"feeDate"` // 日期
+	WorkOrderFeedbackList []*WorkOrderFeedback `json:"workOrderFeedbackList"`
 }
 
-//导出
+// 导出
 type WorkOrderExport struct {
 	WorkOrderSearchReq
 	Columns []string `json:"columns"` // 导出列
 }
 
-//导出字节流
-
+// 导出字节流
 type WorkByteExport struct {
 	Content []byte `json:"content"` // 导出数据流
 }
-
-//详情返回字段
-type WorkDetail struct {
-	Id             int         `  json:"id"`             // 主健
-	OrderTypeDesc  string      `  json:"orderTypeDesc"`  // 工单类型描述
-	OrderStatus    string      `  json:"orderStatus"`    // 工单状态
-	AssignUserName string      `  json:"assignUserName"` // 分派人员姓名
-	FeedBack       string      `  json:"feedBack"`       // 反馈信息
-	CreatedName    string      `  json:"createName"`     //创建人
-	CreatedTime    *gtime.Time `  json:"createTime"`     //创建时间
-
-}

+ 14 - 0
opms_parent/app/model/work/work_order_feedback.go

@@ -0,0 +1,14 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. Fill this file as you wish.
+// ==========================================================================
+
+package work
+
+import (
+	"dashoo.cn/micro/app/model/work/internal"
+)
+
+// WorkOrderFeedback is the golang structure for table work_order_feedback.
+type WorkOrderFeedback internal.WorkOrderFeedback
+
+// Fill with you ideas below.

+ 14 - 0
opms_parent/app/model/work/work_order_feedback_file.go

@@ -0,0 +1,14 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. Fill this file as you wish.
+// ==========================================================================
+
+package work
+
+import (
+	"dashoo.cn/micro/app/model/work/internal"
+)
+
+// WorkOrderFeedbackFile is the golang structure for table work_order_feedback_file.
+type WorkOrderFeedbackFile internal.WorkOrderFeedbackFile
+
+// Fill with you ideas below.

+ 19 - 0
opms_parent/app/model/work/work_order_type.go

@@ -6,9 +6,28 @@ package work
 
 import (
 	"dashoo.cn/micro/app/model/work/internal"
+	"dashoo.cn/opms_libary/request"
 )
 
 // WorkOrderType is the golang structure for table work_order_type.
 type WorkOrderType internal.WorkOrderType
 
 // Fill with you ideas below.
+
+type WorkOrderTypeSearchReq struct {
+	Name         string `json:"name"`         // 名称
+	WorkflowCode string `json:"workflowCode"` // 关联钉钉流程编号
+	request.PageReq
+}
+
+type WorkOrderTypeReq struct {
+	Name         string `json:"name" v:"required#名称不能为空"`               // 名称
+	WorkflowCode string `json:"workflowCode" v:"required#关联钉钉流程编号不能为空"` // 关联钉钉流程编号
+	Sort         int    `json:"sort"`                                   // 排序
+	Remark       string `json:"remark"`                                 // 备注
+}
+
+type UpdateWorkOrderTypeReq struct {
+	Id int `  json:"id"      v:"required#ID不能为空" `
+	WorkOrderTypeReq
+}

+ 3 - 0
opms_parent/app/service/base.go

@@ -13,6 +13,9 @@ import (
 )
 
 var (
+	// DingTalkSpaceId 钉钉 空间Id。
+	DingTalkSpaceId = "21077726250"
+
 	// CommonUpdateFieldEx  UpdateFieldEx 更新过滤字段
 	CommonUpdateFieldEx = []interface{}{"created_by", "created_name", "created_time"}
 	UpdateFieldEx       = []interface{}{"id", "created_by", "created_name", "created_time"}

+ 1 - 4
opms_parent/app/service/base/base_product.go

@@ -47,11 +47,8 @@ func (s *productService) GetList(req *model.ProductSearchReq) (total int, produc
 		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
-	if req.PageNum == 0 {
-		req.PageNum = 1
-	}
 
-	err = Dao.Page(req.PageNum, req.PageSize).Order("id asc").Scan(&productList)
+	err = Dao.Page(req.GetPage()).Order("id asc").Scan(&productList)
 	return
 }
 

+ 21 - 18
opms_parent/app/service/proj/business.go

@@ -81,7 +81,7 @@ func (p *businessService) GetList(req *model.ProjBusinessSearchReq) (total int,
 			Fields("`proj`.cust_city_id as cust_city_id,`contract`.contract_amount, `contract`.created_time as proj_closing_time")
 	}
 	db = db.Fields("`proj`.*")
-	err = db.Page(req.PageNum, req.PageSize).OrderDesc("id").Scan(&businessList)
+	err = db.Page(req.GetPage()).OrderDesc("id").Scan(&businessList)
 	return
 }
 
@@ -690,21 +690,24 @@ func (p *businessService) BusUpgradeDingEvent(business *model.ProjBusiness, req
 		}
 
 	case StatusA:
-		resp, err := dingtalk.Client.GetStorage().UploadFile(spaceId, p.GetCxtUserDingtalkId(), args.FileName, args.File.Name())
-		if err != nil {
-			return fmt.Errorf("钉钉上传文件异常 %s", err.Error())
-		}
-		g.Log().Info("项目转A类提交大数参数文件", resp)
-		file := []contractModel.DingFileInfo{{
-			SpaceId:  resp.Dentry.SpaceId,
-			FileId:   resp.Dentry.Id,
-			FileName: resp.Dentry.Name,
-			FileSize: resp.Dentry.Size,
-			FileType: resp.Dentry.Extension,
-		}}
-		err = p.txCreateBusinessFile(business.Id, file)
-		if err != nil {
-			return err
+		var file []contractModel.DingFileInfo
+		if args != nil {
+			resp, err := dingtalk.Client.GetStorage().UploadFile(service.DingTalkSpaceId, p.GetCxtUserDingtalkId(), args.FileName, args.File.Name())
+			if err != nil {
+				return fmt.Errorf("钉钉上传文件异常 %s", err.Error())
+			}
+			g.Log().Info("项目转A类提交大数参数文件", resp)
+			file = []contractModel.DingFileInfo{{
+				SpaceId:  resp.Dentry.SpaceId,
+				FileId:   resp.Dentry.Id,
+				FileName: resp.Dentry.Name,
+				FileSize: resp.Dentry.Size,
+				FileType: resp.Dentry.Extension,
+			}}
+			err = p.txCreateBusinessFile(business.Id, file)
+			if err != nil {
+				return err
+			}
 		}
 		processCode := &BusinessUpgradeARequestProcessCode
 		dingReq = &workflow.StartProcessInstanceRequest{
@@ -791,7 +794,7 @@ func (p *businessService) BusUpgradeDingEvent(business *model.ProjBusiness, req
 
 // 采用大数参数文件记录
 func (p *businessService) txCreateBusinessFile(busId int, files []contractModel.DingFileInfo) error {
-	dataList := make([]model.ProjBusinessFile, 0)
+	dataList := make([]*model.ProjBusinessFile, 0)
 	for _, v := range files {
 		data := new(model.ProjBusinessFile)
 		data.BusId = busId
@@ -800,7 +803,7 @@ func (p *businessService) txCreateBusinessFile(busId int, files []contractModel.
 		data.FileSize = gconv.String(v.FileSize)
 		data.FileUrl = strings.Join([]string{"dingtalk", v.SpaceId, v.FileId}, ":")
 		service.SetCreatedInfo(data, p.GetCxtUserId(), p.GetCxtUserName())
-		dataList = append(dataList)
+		dataList = append(dataList, data)
 	}
 	_, err := projDao.NewProjBusinessFileDao(p.Tenant).Insert(&dataList)
 	return err

+ 0 - 2
opms_parent/app/service/proj/const.go

@@ -76,5 +76,3 @@ var yesOrNoType = g.MapStrStr{
 	"10": "是", // 是/option_0
 	"20": "否", // 否/option_1
 }
-
-var spaceId = "21077726250"

+ 235 - 23
opms_parent/app/service/work/work_order.go

@@ -3,7 +3,21 @@ package work
 import (
 	"bytes"
 	"context"
+	contractModel "dashoo.cn/micro/app/model/contract"
+	workflowModel "dashoo.cn/micro/app/model/workflow"
+	workflowService "dashoo.cn/micro/app/service/workflow"
+	"dashoo.cn/opms_libary/multipart"
+	"dashoo.cn/opms_libary/plugin/dingtalk"
+	"dashoo.cn/opms_libary/plugin/dingtalk/message"
+	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
+	"database/sql"
+	"fmt"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
 	"strconv"
+	"strings"
 
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
@@ -16,7 +30,8 @@ import (
 
 type OrderService struct {
 	*service.ContextService
-	Dao *work.WorkOrderDao
+	Dao         *work.WorkOrderDao
+	FeedbackDao *work.WorkOrderFeedbackDao
 }
 
 // 工单状态
@@ -29,32 +44,45 @@ func NewOrderService(ctx context.Context) (svc *OrderService, err error) {
 		return nil, err
 	}
 	svc.Dao = work.NewWorkOrderDao(svc.Tenant)
+	svc.FeedbackDao = work.NewWorkOrderFeedbackDao(svc.Tenant)
 	return svc, nil
 }
 
 // 列表
-func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
-	Model := s.Dao
+func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, orderList []*model.WorkOrder, err error) {
+	db := s.Dao.FieldsEx(s.Dao.C.DeletedTime)
+	if req.Name != "" {
+		db = db.WhereLike(s.Dao.C.Name, "%"+req.Name+"%")
+	}
+	if req.NboName != "" {
+		db = db.WhereLike(s.Dao.C.NboName, "%"+req.NboName+"%")
+	}
+	if req.NboCode != "" {
+		db = db.WhereLike(s.Dao.C.NboCode, "%"+req.NboCode+"%")
+	}
+	if req.CustName != "" {
+		db = db.WhereLike(s.Dao.C.CustName, "%"+req.CustName+"%")
+	}
+	if req.NboId != 0 {
+		db = db.Where(s.Dao.C.NboId, req.NboId)
+	}
+	if req.CustId != 0 {
+		db = db.Where(s.Dao.C.CustId, req.CustId)
+	}
 	//工单类型
-	if req.OrderTypeId != 0 {
-		Model.Where(s.Dao.C.OrderTypeId, req.OrderTypeId)
+	if req.OrderTypeName != "" {
+		db = db.WhereLike(s.Dao.C.OrderTypeName, "%"+req.OrderTypeName+"%")
 	}
 	//工单状态
 	if req.OrderStatus != "" {
-		Model.Where(s.Dao.C.OrderStatus, req.OrderStatus)
+		db = db.Where(s.Dao.C.OrderStatus, req.OrderStatus)
 	}
-	total, err = Model.Fields().Count()
+	total, err = db.Count()
 	if err != nil {
 		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
-	if req.PageNum == 0 {
-		req.PageNum = 1
-	}
-	err = Model.Page(req.PageNum, req.PageSize).Order("id desc").Scan(&OrderList)
-	for _, v := range OrderList {
-		v.OrderStatus = MapStatus[v.OrderStatus]
-	}
+	err = db.Page(req.GetPage()).Order("id desc").Scan(&orderList)
 	return
 }
 
@@ -77,7 +105,7 @@ func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 		for ck, item := range data {
 			for index, v := range req.Columns {
 				if v == "工单类型" {
-					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.OrderTypeDesc)
+					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.OrderTypeName)
 				}
 				if v == "工单状态" {
 					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), MapStatus[item.OrderStatus])
@@ -86,7 +114,7 @@ func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.AssignUserName)
 				}
 				if v == "反馈信息" {
-					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.FeedBack)
+					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.Feedback)
 				}
 				if v == "创建人" {
 					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.CreatedName)
@@ -107,18 +135,202 @@ func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 }
 
 // 详情
-func (s *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
-	Model := s.Dao
-	err = Model.Where(s.Dao.C.Id, req.Id).Scan(&detail)
+func (s *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkOrder, err error) {
+	detail, err = s.Dao.WherePri(req.Id).One()
+	return
+}
+
+func (s *OrderService) UpdateById(req *model.UpdateWorkOrderReq) error {
+	count, err := s.Dao.Count(req.Id)
+	if err != nil {
+		return err
+	}
+	if count == 0 {
+		return myerrors.TipsError("修改信息不存在")
+	}
+	data := new(model.WorkOrder)
+	if err = gconv.Struct(req, data); err != nil {
+		return err
+	}
+	service.SetUpdatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
+	_, err = s.Dao.FieldsEx(service.UpdateFieldEx...).WherePri(s.Dao.C.Id, req.Id).Data(data).Update()
 	if err != nil {
-		err = myerrors.DbError("获取详情失败。")
+		return err
+	}
+	return nil
+}
+
+func (s *OrderService) CreateWorkOrder(req *model.WorkOrderReq, args *multipart.MultipartFile) (err error) {
+	data := new(model.WorkOrder)
+	if err = gconv.Struct(req, data); err != nil {
+		return
+	}
+	data.OrderStatus = "20"
+	service.SetCreatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
+
+	if args != nil {
+		for k, v := range req.FormData {
+			if v.ComponentName == "DDAttachment" {
+				file, err := s.UploadFile(args)
+				if err != nil {
+					return err
+				}
+				v.Value = file
+				data.File = strings.Join([]string{"dingtalk", file[0].SpaceId, file[0].FileId}, ":")
+			}
+			req.FormData[k].Value = gconv.String(v.Value)
+		}
+	}
+
+	formComponentValues := make([]*workflow.StartProcessInstanceRequestFormComponentValues, 0)
+	if err = gconv.Structs(req.FormData, &formComponentValues); err != nil {
 		return
 	}
+
+	err = s.Dao.Transaction(context.TODO(), func(ctx context.Context, tx *gdb.TX) error {
+		// 更新项目调级
+		lastId, err := s.Dao.TX(tx).Data(data).InsertAndGetId()
+		if err != nil {
+			return err
+		}
+
+		// 提交工单 审批
+		workflowSrv, _ := workflowService.NewFlowService(s.Ctx)
+		bizCode := gconv.String(lastId) + ":" + req.OrderTypeCode
+
+		workflowId, err := workflowSrv.StartProcessInstance(bizCode, workflowModel.ProjectToReserve, "", &workflow.StartProcessInstanceRequest{
+			ProcessCode:         &req.OrderTypeCode,
+			FormComponentValues: formComponentValues,
+		})
+		g.Log().Info("工单审批流ID ", workflowId)
+		if err != nil {
+			g.Log().Error(err)
+			return err
+		}
+		return err
+	})
 	return
 }
 
-//删除
+func (s *OrderService) UploadFile(args *multipart.MultipartFile) ([]contractModel.DingFileInfo, error) {
+	resp, err := dingtalk.Client.GetStorage().UploadFile(service.DingTalkSpaceId, s.GetCxtUserDingtalkId(), args.FileName, args.File.Name())
+	if err != nil {
+		return nil, myerrors.TipsError(fmt.Sprintf("钉钉上传文件异常 %s", err.Error()))
+	}
+	g.Log().Info("钉钉上传附件", resp)
+	file := []contractModel.DingFileInfo{{
+		SpaceId:  resp.Dentry.SpaceId,
+		FileId:   resp.Dentry.Id,
+		FileName: resp.Dentry.Name,
+		FileSize: resp.Dentry.Size,
+		FileType: resp.Dentry.Extension,
+	}}
+	return file, nil
+}
 
-//修改
+// WorkOrderNotify 工单 审批结果通知
+func (s *OrderService) WorkOrderNotify(flow *workflowModel.PlatWorkflow, msg *message.MixMessage) error {
+	bizCode := strings.Split(flow.BizCode, ":")
+	if len(bizCode) != 2 {
+		return fmt.Errorf("工单审批 bizCode 不合法:%s Id: %d", flow.BizCode, flow.Id)
+	}
+	workOrderId := bizCode[0]
+	if msg.ProcessType != "finish" && msg.ProcessType != "terminate" {
+		return fmt.Errorf("无法识别的 ProcessType :%s", msg.ProcessType)
+	}
+	if msg.Result != "agree" && msg.Result != "refuse" && msg.Result != "" {
+		return fmt.Errorf("无法识别的 Result :%s", msg.Result)
+	}
+	fmt.Println(msg)
 
-//动态
+	workOrder, err := s.Dao.WherePri(workOrderId).One()
+	if err != nil {
+		return err
+	}
+	if workOrder == nil {
+		return fmt.Errorf("工单不存在:%s Id: %d", flow.BizCode, flow.Id)
+	}
+
+	var data = g.Map{}
+	// 工单状态(10发起20审批中30审批通过40审批拒绝50关闭)
+	if msg.ProcessType == "terminate" {
+		data[s.Dao.C.OrderStatus] = "50"
+	}
+	if msg.ProcessType == "finish" && msg.Result == "refuse" {
+		data[s.Dao.C.OrderStatus] = "40"
+	}
+	if msg.ProcessType == "finish" && msg.Result == "agree" {
+		data[s.Dao.C.OrderStatus] = "30"
+	}
+
+	// 项目修改
+	_, err = s.Dao.WherePri(workOrder.Id).FieldsEx(service.UpdateFieldEx...).Data(data).Update()
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+// CreateWorkOrderFeedback 创建工单反馈
+func (s *OrderService) CreateWorkOrderFeedback(req *model.WorkOrderFeedbackReq) error {
+	data := new(model.WorkOrderFeedback)
+	if err := gconv.Struct(req, data); err != nil {
+		return err
+	}
+	data.FeePeopleId = s.GetCxtUserId()
+	data.FeePeople = s.GetCxtUserName()
+	data.FeeDate = gtime.Now()
+	service.SetUpdatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
+	_, err := s.FeedbackDao.Data(data).Insert()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *OrderService) GetWorkOrderFeedbackByDay(req *model.WorkOrderFeedbackSearchReq) (list []*model.WorkOrderFeedbackRes, err error) {
+	db := s.FeedbackDao.FieldsEx(s.Dao.C.DeletedTime).Where(s.FeedbackDao.C.OrderId, req.OrderId)
+	if req.FeePeople != "" {
+		db = db.WhereLike(s.FeedbackDao.C.FeePeople, "%"+req.FeePeople+"%")
+	}
+	// 日期条件
+	if req.DaysBeforeToday > 0 { // 获取前N天的跟进记录
+		now := gtime.Now()
+		begin := now.AddDate(0, 0, -req.DaysBeforeToday).Format("Y-m-d 00:00:00")
+		db = db.WhereGTE(s.FeedbackDao.C.FeeDate, begin)
+	}
+	// 获取日期区间范围内的记录
+	if req.BeginTime != "" {
+		begin := strings.Split(req.BeginTime, " ")[0] + " 00:00:00"
+		db = db.WhereGTE(s.FeedbackDao.C.FeeDate, begin)
+	}
+	if req.EndTime != "" {
+		end := strings.Split(req.EndTime, " ")[0] + " 23:59:59"
+		db = db.WhereLTE(s.FeedbackDao.C.FeeDate, end)
+	}
+
+	// 查询原始记录
+	originalRecords, err := db.OrderDesc(s.FeedbackDao.C.FeeDate).All()
+	if err != nil && err != sql.ErrNoRows {
+		return
+	}
+	// 构造数据
+	var days []string
+	recordsMap := make(map[string][]*model.WorkOrderFeedback, 0)
+	// 跟进记录map
+	for index, feedback := range originalRecords {
+		if _, ok := recordsMap[feedback.FeeDate.Format("Y-m-d")]; !ok {
+			days = append(days, feedback.FeeDate.Format("Y-m-d"))
+			recordsMap[feedback.FeeDate.Format("Y-m-d")] = make([]*model.WorkOrderFeedback, 0)
+		}
+		recordsMap[feedback.FeeDate.Format("Y-m-d")] = append(recordsMap[feedback.FeeDate.Format("Y-m-d")], originalRecords[index])
+	}
+
+	for _, day := range days {
+		var records model.WorkOrderFeedbackRes
+		records.FeeDate = day
+		records.WorkOrderFeedbackList = recordsMap[day]
+		list = append(list, &records)
+	}
+	return
+}

+ 92 - 0
opms_parent/app/service/work/work_order_type.go

@@ -0,0 +1,92 @@
+package work
+
+import (
+	"context"
+	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/micro/app/dao/work"
+	model "dashoo.cn/micro/app/model/work"
+	"dashoo.cn/micro/app/service"
+	workflowService "dashoo.cn/micro/app/service/workflow"
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+)
+
+type WorkOrderTypeService struct {
+	*service.ContextService
+	Dao *work.WorkOrderTypeDao
+}
+
+func NewWorkOrderTypeService(ctx context.Context) (svc *WorkOrderTypeService, err error) {
+	svc = new(WorkOrderTypeService)
+	if svc.ContextService, err = svc.Init(ctx); err != nil {
+		return nil, err
+	}
+	svc.Dao = work.NewWorkOrderTypeDao(svc.Tenant)
+	return svc, nil
+}
+
+func (s *WorkOrderTypeService) GetList(req *model.WorkOrderTypeSearchReq) (total int, orderTypeList []*model.WorkOrderType, err error) {
+	total, err = s.Dao.Count()
+	if err != nil {
+		err = myerrors.DbError("获取总行数失败。")
+		return
+	}
+	orderTypeList, err = s.Dao.Page(req.GetPage()).OrderAsc(s.Dao.C.Sort).All()
+	return
+}
+
+func (s *WorkOrderTypeService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkOrderType, err error) {
+	detail, err = s.Dao.Where(s.Dao.C.Id, req.Id).One()
+	if err != nil {
+		return
+	}
+	return
+}
+
+func (s *WorkOrderTypeService) Create(req *model.WorkOrderTypeReq) (err error) {
+	data := new(model.WorkOrderType)
+	if err = gconv.Struct(req, data); err != nil {
+		return
+	}
+	service.SetCreatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
+	_, err = s.Dao.Data(data).Insert()
+	return
+}
+
+func (s *WorkOrderTypeService) UpdateById(req *model.UpdateWorkOrderTypeReq) error {
+	count, err := s.Dao.Count(req.Id)
+	if err != nil {
+		return err
+	}
+	if count == 0 {
+		return myerrors.TipsError("修改信息不存在")
+	}
+	data := new(model.WorkOrderType)
+	if err = gconv.Struct(req, data); err != nil {
+		return err
+	}
+	service.SetUpdatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
+	_, err = s.Dao.FieldsEx(service.UpdateFieldEx...).WherePri(s.Dao.C.Id, req.Id).Data(data).Update()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *WorkOrderTypeService) DeleteByIds(ids []int64) (err error) {
+	_, err = s.Dao.WhereIn(s.Dao.C.Id, ids).Delete()
+	return
+}
+
+// SyncDingTalkForm 同步钉钉工单审批流表单
+func (s *WorkOrderTypeService) SyncDingTalkForm(req *model.WorkOrderTypeReq) (err error) {
+	workflowSrv, _ := workflowService.NewFlowService(s.Ctx)
+	dingTalkForm, err := workflowSrv.GetSchemaByProcessCode(req.WorkflowCode)
+	if err != nil {
+		g.Log().Error(err)
+		return myerrors.TipsError(req.Name + "获取钉钉审批流表单失败")
+	}
+	_, err = s.Dao.Where(s.Dao.C.WorkflowCode, req.WorkflowCode).Data(s.Dao.C.FormColumn, dingTalkForm.Result.SchemaContent).Update()
+	return
+}

+ 13 - 0
opms_parent/app/service/workflow/work_flow.go

@@ -31,6 +31,19 @@ func NewFlowService(ctx context.Context) (svc *workflowService, err error) {
 	return svc, nil
 }
 
+// GetSchemaByProcessCode 获取表单 schema(钉钉接口)
+func (s *workflowService) GetSchemaByProcessCode(processCode string) (*workflow.QuerySchemaByProcessCodeResponse, error) {
+	g.Log().Info("搜索值", processCode)
+	// 调用钉钉接口
+	client := dingtalk.NewClient()
+	w := client.GetWorkflow()
+	resp, err := w.QuerySchemaByProcessCode(processCode)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
 // GetProcessInstanceDetail 获取审批实例详情(钉钉接口)
 func (s *workflowService) GetProcessInstanceDetail(instId string) (*workflow.QueryProcessInstanceResponse, error) {
 	g.Log().Info("搜索值", instId)

+ 2 - 0
opms_parent/main.go

@@ -54,6 +54,7 @@ func main() {
 	s.RegisterName("CtrContractAppend", new(contract.CtrContractAppend), "")
 	s.RegisterName("CtrContractInvoice", new(contract.CtrContractInvoice), "")
 	s.RegisterName("WorkOrder", new(work.WorkOrderHandler), "")
+	s.RegisterName("WorkOrderType", new(work.WorkOrderTypeHandler), "")
 	s.RegisterName("Schedule", new(plat.ScheduleHeader), "")
 	s.RegisterName("PlatWorkflow", new(workflow.PlatWorkflowHandler), "")
 	s.RegisterName("DingUpload", new(dingtalk.DingUploadHandler), "")
@@ -71,6 +72,7 @@ func main() {
 
 	dynamic.Invoker.Register(new(contract.CtrContractHandler))
 	dynamic.Invoker.Register(new(projHandler.BusinessHandler))
+	dynamic.Invoker.Register(new(work.WorkOrderHandler))
 	// 注册服务对象
 	//s.RegisterName("Auth", new(handler.Auth), "")
 

Some files were not shown because too many files changed in this diff