feature:添加销售、回款指标统计

opms_parent/app/dao/contract/ctr_contract_goal.go

@@ -0,0 +1,36 @@
+// ============================================================================
+// This is auto-generated by gf cli tool only once. Fill this file as you wish.
+// ============================================================================
+
+package dao
+
+import (
+	"dashoo.cn/micro/app/dao/contract/internal"
+)
+
+// ctrContractGoalDao 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 ctrContractGoalDao struct {
+	internal.CtrContractGoalDao
+}
+
+var (
+	// CtrContractGoal is globally public accessible object for table ctr_contract_goal operations.
+	CtrContractGoal = ctrContractGoalDao{
+		internal.CtrContractGoal,
+	}
+)
+
+type CtrContractGoalDao struct {
+	internal.CtrContractGoalDao
+}
+
+func NewCtrContractGoalDao(tenant string) *CtrContractGoalDao {
+	dao := internal.NewCtrContractGoalDao(tenant)
+	return &CtrContractGoalDao{
+		dao,
+	}
+}
+
+// Fill with you ideas below.

opms_parent/app/dao/contract/internal/ctr_contract_goal.go

@@ -0,0 +1,746 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+	"database/sql"
+	"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/contract"
+)
+
+// CtrContractGoalDao is the manager for logic model data accessing and custom defined data operations functions management.
+type CtrContractGoalDao struct {
+	gmvc.M                         // M is the core and embedded struct that inherits all chaining operations from gdb.Model.
+	C       ctrContractGoalColumns // 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.
+}
+
+// CtrContractGoalColumns defines and stores column names for table ctr_contract_goal.
+type ctrContractGoalColumns struct {
+	Id          string // 主键
+	GoalType    string // 销售指标类型 10 销售 20 回款
+	Year        string // 年度
+	Quarter     string // 季度
+	ProductLine string // 产品线
+	Amount      string // 金额（万元）
+	Remark      string // 备注
+	CreatedBy   string // 创建者
+	CreatedName string // 创建人
+	CreatedTime string // 创建时间
+	UpdatedBy   string // 更新者
+	UpdatedName string // 更新人
+	UpdatedTime string // 更新时间
+	DeletedTime string // 删除时间
+}
+
+var (
+	// CtrContractGoal is globally public accessible object for table ctr_contract_goal operations.
+	CtrContractGoal = CtrContractGoalDao{
+		M:     g.DB("default").Model("ctr_contract_goal").Safe(),
+		DB:    g.DB("default"),
+		Table: "ctr_contract_goal",
+		C: ctrContractGoalColumns{
+			Id:          "id",
+			GoalType:    "goal_type",
+			Year:        "year",
+			Quarter:     "quarter",
+			ProductLine: "product_line",
+			Amount:      "amount",
+			Remark:      "remark",
+			CreatedBy:   "created_by",
+			CreatedName: "created_name",
+			CreatedTime: "created_time",
+			UpdatedBy:   "updated_by",
+			UpdatedName: "updated_name",
+			UpdatedTime: "updated_time",
+			DeletedTime: "deleted_time",
+		},
+	}
+)
+
+func NewCtrContractGoalDao(tenant string) CtrContractGoalDao {
+	var dao CtrContractGoalDao
+	dao = CtrContractGoalDao{
+		M:     g.DB(tenant).Model("ctr_contract_goal").Safe(),
+		DB:    g.DB(tenant),
+		Table: "ctr_contract_goal",
+		C: ctrContractGoalColumns{
+			Id:          "id",
+			GoalType:    "goal_type",
+			Year:        "year",
+			Quarter:     "quarter",
+			ProductLine: "product_line",
+			Amount:      "amount",
+			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 *CtrContractGoalDao) Ctx(ctx context.Context) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) GetCtx() context.Context {
+	return d.M.GetCtx()
+}
+
+// As sets an alias name for current table.
+func (d *CtrContractGoalDao) As(as string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.As(as), Table: d.Table, TableAs: as}
+}
+
+// TX sets the transaction for current operation.
+func (d *CtrContractGoalDao) TX(tx *gdb.TX) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.TX(tx), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Master marks the following operation on master node.
+func (d *CtrContractGoalDao) Master() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Slave() *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Slave(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Args sets custom arguments for model operation.
+func (d *CtrContractGoalDao) Args(args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Handler(handlers ...gdb.ModelHandler) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) LeftJoin(table ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) RightJoin(table ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) InnerJoin(table ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Fields(fieldNamesOrMapStruct ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldsEx(fieldNamesOrMapStruct ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldCount(column string, as ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldSum(column string, as ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldMin(column string, as ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldMax(column string, as ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) FieldAvg(column string, as ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Option(option int) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitEmpty() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitEmptyWhere() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitEmptyData() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitNil() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitNilWhere() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OmitNilData() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Filter() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Where(where interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WherePri(where interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Having(having interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Wheref(format string, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Wheref(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLT builds "column < value" statement.
+func (d *CtrContractGoalDao) WhereLT(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLTE builds "column <= value" statement.
+func (d *CtrContractGoalDao) WhereLTE(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGT builds "column > value" statement.
+func (d *CtrContractGoalDao) WhereGT(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereGTE builds "column >= value" statement.
+func (d *CtrContractGoalDao) WhereGTE(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereGTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereBetween builds "column BETWEEN min AND max" statement.
+func (d *CtrContractGoalDao) WhereBetween(column string, min, max interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereLike builds "column LIKE like" statement.
+func (d *CtrContractGoalDao) WhereLike(column string, like interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereIn builds "column IN (in)" statement.
+func (d *CtrContractGoalDao) WhereIn(column string, in interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereNull(columns ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotBetween builds "column NOT BETWEEN min AND max" statement.
+func (d *CtrContractGoalDao) WhereNotBetween(column string, min, max interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereNotBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotLike builds "column NOT LIKE like" statement.
+func (d *CtrContractGoalDao) WhereNotLike(column string, like interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNot builds "column != value" statement.
+func (d *CtrContractGoalDao) WhereNot(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereNot(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereNotIn builds "column NOT IN (in)" statement.
+func (d *CtrContractGoalDao) WhereNotIn(column string, in interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereNotNull(columns ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOr adds "OR" condition to the where statement.
+func (d *CtrContractGoalDao) WhereOr(where interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOr(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrf builds "OR" condition string using fmt.Sprintf and arguments.
+func (d *CtrContractGoalDao) WhereOrf(format string, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrf(format, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLT builds "column < value" statement in "OR" conditions..
+func (d *CtrContractGoalDao) WhereOrLT(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrLT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLTE builds "column <= value" statement in "OR" conditions..
+func (d *CtrContractGoalDao) WhereOrLTE(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrLTE(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGT builds "column > value" statement in "OR" conditions..
+func (d *CtrContractGoalDao) WhereOrGT(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrGT(column, value), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrGTE builds "column >= value" statement in "OR" conditions..
+func (d *CtrContractGoalDao) WhereOrGTE(column string, value interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereOrBetween(column string, min, max interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrBetween(column, min, max), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrLike builds "column LIKE like" statement in "OR" conditions.
+func (d *CtrContractGoalDao) WhereOrLike(column string, like interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrIn builds "column IN (in)" statement in "OR" conditions.
+func (d *CtrContractGoalDao) WhereOrIn(column string, in interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereOrNull(columns ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereOrNotBetween(column string, min, max interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereOrNotLike(column string, like interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrNotLike(column, like), Table: d.Table, TableAs: d.TableAs}
+}
+
+// WhereOrNotIn builds "column NOT IN (in)" statement.
+func (d *CtrContractGoalDao) WhereOrNotIn(column string, in interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) WhereOrNotNull(columns ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.WhereOrNotNull(columns...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Group sets the "GROUP BY" statement for the model.
+func (d *CtrContractGoalDao) Group(groupBy ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) And(where interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Or(where interface{}, args ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Or(where, args...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// GroupBy sets the "GROUP BY" statement for the model.
+func (d *CtrContractGoalDao) GroupBy(groupBy string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Group(groupBy), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Order sets the "ORDER BY" statement for the model.
+func (d *CtrContractGoalDao) Order(orderBy ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Order(orderBy...), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderAsc sets the "ORDER BY xxx ASC" statement for the model.
+func (d *CtrContractGoalDao) OrderAsc(column string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.OrderAsc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderDesc sets the "ORDER BY xxx DESC" statement for the model.
+func (d *CtrContractGoalDao) OrderDesc(column string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.OrderDesc(column), Table: d.Table, TableAs: d.TableAs}
+}
+
+// OrderRandom sets the "ORDER BY RANDOM()" statement for the model.
+func (d *CtrContractGoalDao) OrderRandom() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) OrderBy(orderBy string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Limit(limit ...int) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Offset(offset int) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Offset(offset), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Distinct forces the query to only return distinct results.
+func (d *CtrContractGoalDao) Distinct() *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Page(page, limit int) *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Page(page, limit), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Batch sets the batch operation number for the model.
+func (d *CtrContractGoalDao) Batch(batch int) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Cache(duration time.Duration, name ...string) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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 *CtrContractGoalDao) Data(data ...interface{}) *CtrContractGoalDao {
+	return &CtrContractGoalDao{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.CtrContractGoal.
+// 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 *CtrContractGoalDao) All(where ...interface{}) ([]*model.CtrContractGoal, error) {
+	all, err := d.M.All(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.CtrContractGoal
+	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.CtrContractGoal.
+// 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 *CtrContractGoalDao) One(where ...interface{}) (*model.CtrContractGoal, error) {
+	one, err := d.M.One(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.CtrContractGoal
+	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 *CtrContractGoalDao) FindOne(where ...interface{}) (*model.CtrContractGoal, error) {
+	one, err := d.M.FindOne(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *model.CtrContractGoal
+	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 *CtrContractGoalDao) FindAll(where ...interface{}) ([]*model.CtrContractGoal, error) {
+	all, err := d.M.FindAll(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*model.CtrContractGoal
+	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 *CtrContractGoalDao) 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 *CtrContractGoalDao) 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 *CtrContractGoalDao) Scan(pointer interface{}, where ...interface{}) error {
+	return d.M.Scan(pointer, where...)
+}
+
+// Chunk iterates the table with given size and callback function.
+func (d *CtrContractGoalDao) Chunk(limit int, callback func(entities []*model.CtrContractGoal, err error) bool) {
+	d.M.Chunk(limit, func(result gdb.Result, err error) bool {
+		var entities []*model.CtrContractGoal
+		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 *CtrContractGoalDao) LockUpdate() *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.LockUpdate(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// LockShared sets the lock in share mode for current operation.
+func (d *CtrContractGoalDao) LockShared() *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.LockShared(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// Unscoped enables/disables the soft deleting feature.
+func (d *CtrContractGoalDao) Unscoped() *CtrContractGoalDao {
+	return &CtrContractGoalDao{M: d.M.Unscoped(), Table: d.Table, TableAs: d.TableAs}
+}
+
+// DataScope enables the DataScope feature.
+func (d *CtrContractGoalDao) DataScope(ctx context.Context, userCol ...string) *CtrContractGoalDao {
+	cs := ctx.Value("contextService")
+	dataScope := gconv.Map(cs)["dataScope"].(g.Map)
+	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)
+			}
+			if d.Table == "sys_user" {
+				column = "id"
+				orColumns = append(orColumns, tableAs+column+" IN (?) ")
+				orValues = append(orValues, userIds)
+			}
+		}
+		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 &CtrContractGoalDao{M: d.M.Where(whereSql, orValues...).Ctx(ctx), Table: d.Table, TableAs: d.TableAs}
+	}
+	return d
+}

opms_parent/app/model/contract/ctr_contract_goal.go

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

opms_parent/app/model/contract/internal/ctr_contract_goal.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"
+)
+
+// CtrContractGoal is the golang structure for table ctr_contract_goal.
+type CtrContractGoal struct {
+	Id          int         `orm:"id,primary"   json:"id"`          // 主键
+	GoalType    string      `orm:"goal_type"    json:"goalType"`    // 销售指标类型 10 销售 20 回款
+	Year        int         `orm:"year"         json:"year"`        // 年度
+	Quarter     int         `orm:"quarter"      json:"quarter"`     // 季度
+	ProductLine string      `orm:"product_line" json:"productLine"` // 产品线
+	Amount      float64     `orm:"amount"       json:"amount"`      // 金额（万元）
+	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"` // 删除时间
+}

opms_parent/app/service/contract/ctr_contract.go

@@ -47,6 +47,7 @@ type CtrContractService struct {
 	DynamicsDao     *dao.CtrContractDynamicsDao
 	WorkflowDao     *workflowdao.PlatWorkflowDao
 	AppendDao       *dao.CtrContractAppendDao
+	GoalDao         *dao.CtrContractGoalDao
 
 	Tenant    string
 	userInfo  request.UserInfo
@@ -73,6 +74,7 @@ func NewCtrContractService(ctx context.Context) (*CtrContractService, error) {
 		DynamicsDao:     dao.NewCtrContractDynamicsDao(tenant),
 		WorkflowDao:     workflowdao.NewPlatWorkflowDao(tenant),
 		AppendDao:       dao.NewCtrContractAppendDao(tenant),
+		GoalDao:         dao.NewCtrContractGoalDao(tenant),
 		Tenant:          tenant,
 		userInfo:        userInfo,
 		DataScope:       userInfo.DataScope,

opms_parent/app/service/home/home.go

@@ -106,6 +106,12 @@ func (s *HomeService) getReportData(id int64, params *map[string]interface{}) (i
 	case 20003:
 		// 报表数据   总部销售回款
 		return getCompanyContractReportData(s.ContextService.Ctx, "COLLECTION", params)
+	case 20004:
+		// 报表数据   季度销售指标
+		return getQuarterGoalReportData(s.ContextService.Ctx, "10", params)
+	case 20005:
+		// 报表数据   季度回款指标
+		return getQuarterGoalReportData(s.ContextService.Ctx, "20", params)
 	default:
 		return nil, nil
 	}

opms_parent/app/service/home/report.go

@@ -2,11 +2,13 @@ package home
 
 import (
 	"context"
+	"database/sql"
+	"fmt"
+
 	"dashoo.cn/micro/app/model/home"
+	"dashoo.cn/micro/app/service"
 	contractService "dashoo.cn/micro/app/service/contract"
 	"dashoo.cn/opms_libary/micro_srv"
-	"database/sql"
-	"fmt"
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
@@ -182,6 +184,86 @@ func getCompanyContractReportData(ctx context.Context, dataType string, params *
 	return &reportData, nil
 }
 
+func getQuarterGoalReportData(ctx context.Context, dataType string, params *map[string]interface{}) (*home.ReportData, error) {
+	if params == nil {
+		return nil, fmt.Errorf("请输入年度")
+	}
+	p := *params
+	year, _ := p["year"].(int)
+	quarter, _ := p["quarter"].(int)
+	if year == 0 {
+		return nil, fmt.Errorf("请输入年度")
+	}
+
+	srv, err := contractService.NewCtrContractService(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	goal := map[string]float64{}
+	goaldao := srv.GoalDao.Where("year = ?", year).Where("goal_type = ?", dataType)
+	if quarter != 0 {
+		goaldao = goaldao.Where("quarter = ?", quarter)
+	} else {
+		goaldao = goaldao.Where("quarter = 1 || quarter = 2 || quarter = 3 || quarter = 4")
+	}
+	goalent, err := goaldao.All()
+	if err != nil {
+		return nil, err
+	}
+	for _, ent := range goalent {
+		goal[ent.ProductLine] += ent.Amount
+	}
+
+	got := map[string]float64{}
+	ctrdao := srv.Dao.Where("year(created_time) = ?", year)
+	if quarter != 0 {
+		if quarter == 1 {
+			ctrdao = ctrdao.Where("month(created_time) in (1,2,3)")
+		}
+		if quarter == 2 {
+			ctrdao = ctrdao.Where("month(created_time) in (4,5,6)")
+		}
+		if quarter == 3 {
+			ctrdao = ctrdao.Where("month(created_time) in (7,8,9)")
+		}
+		if quarter == 4 {
+			ctrdao = ctrdao.Where("month(created_time) in (10,11,12)")
+		}
+	}
+	ctrent, err := ctrdao.All()
+	if err != nil {
+		return nil, err
+	}
+	for _, ent := range ctrent {
+		if dataType == "10" {
+			got[ent.ProductLine] += ent.ContractAmount
+		}
+		if dataType == "20" {
+			got[ent.ProductLine] += ent.CollectedAmount
+		}
+	}
+
+	productLine, err := service.GetDictDataByType(ctx, "sys_product_line")
+	if err != nil {
+		return nil, err
+	}
+	productLineCode := []string{}
+	productLineName := []string{}
+	for k, v := range productLine {
+		productLineCode = append(productLineCode, k)
+		productLineName = append(productLineName, v)
+	}
+
+	var reportData home.ReportData
+	for _, c := range productLineCode {
+		reportData.XData = append(reportData.XData, productLine[c])
+		reportData.YDataTarget = append(reportData.YDataTarget, goal[c]/10000)
+		reportData.YDataReal = append(reportData.YDataReal, got[c]/10000)
+	}
+	return &reportData, nil
+}
+
 func getQuarterWhere(date *gtime.Time, field string) string {
 	if date.Month() >= 1 && date.Month() <= 3 {
 		return fmt.Sprintf("%v >= '%v' AND %v < '%v'", field, date.Format("Y-")+"01-01 00:00:00", field, date.Format("Y-")+"04-01 00:00:00")

opms_parent/schema/contract.sql

@@ -159,8 +159,24 @@ CREATE TABLE `ctr_contract_dynamics` (
     `updated_time` datetime DEFAULT NULL COMMENT '更新时间',
     `deleted_time` datetime DEFAULT NULL COMMENT '删除时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='合同动态';
-
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '合同动态';
+CREATE TABLE `ctr_contract_goal` (
+    `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `goal_type` varchar(4) NOT NULL COMMENT '销售指标类型 10 销售 20 回款',
+    `year` int(11) NOT NULL COMMENT '年度',
+    `quarter` TINYINT NOT NULL COMMENT '季度',
+    `product_line` varchar(4) NOT NULL COMMENT '产品线',
+    `amount` decimal(24, 6) NOT NULL COMMENT '金额（万元）',
+    `remark` text DEFAULT NULL COMMENT '备注',
+    `created_by` int(11) NOT NULL COMMENT '创建者',
+    `created_name` varchar(90) NOT NULL COMMENT '创建人',
+    `created_time` datetime NOT NULL COMMENT '创建时间',
+    `updated_by` int(11) DEFAULT NULL COMMENT '更新者',
+    `updated_name` varchar(90) DEFAULT NULL COMMENT '更新人',
+    `updated_time` datetime DEFAULT NULL COMMENT '更新时间',
+    `deleted_time` datetime DEFAULT NULL COMMENT '删除时间',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '季度指标表';
 
 -- ctr_contract                 合同信息
 -- ctr_contract_append          合同附件信息