diff --git a/dal/sqlcgen/models.go b/dal/sqlcgen/models.go index 6172c73..5cae87e 100644 --- a/dal/sqlcgen/models.go +++ b/dal/sqlcgen/models.go @@ -21,13 +21,13 @@ type Account struct { } type Amocrmstatus struct { - ID int64 `db:"id" json:"id"` - Accountid int32 `db:"accountid" json:"accountid"` - Questionid int64 `db:"questionid" json:"questionid"` - Answerid int64 `db:"answerid" json:"answerid"` - Fieldid int32 `db:"fieldid" json:"fieldid"` - Status string `db:"status" json:"status"` - Createdat sql.NullTime `db:"createdat" json:"createdat"` + ID int64 `db:"id" json:"id"` + Accountid int32 `db:"accountid" json:"accountid"` + Dealid int32 `db:"dealid" json:"dealid"` + Answerid int64 `db:"answerid" json:"answerid"` + Fieldid []int32 `db:"fieldid" json:"fieldid"` + Status string `db:"status" json:"status"` + Createdat sql.NullTime `db:"createdat" json:"createdat"` } type Answer struct { diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index 72e5344..0eb474b 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -2523,7 +2523,7 @@ func (q *Queries) GetUtmsByID(ctx context.Context, dollar_1 []int32) ([]GetUtmsB } const gettingAmoUsersTrueResults = `-- name: GettingAmoUsersTrueResults :many -SELECT a.quiz_id,a.id,a.result,a.question_id,a.content,a.session,t.accesstoken,r.accountid,r.utms,r.fieldsrule,r.performerid,r.stepid,r.pipelineid +SELECT a.quiz_id,a.id,a.result,a.question_id,a.content,a.session,t.accesstoken,r.accountid,r.utms,r.fieldsrule,r.performerid,r.stepid,r.pipelineid,(SELECT u.name FROM users u WHERE u.amoid = r.performerid) AS performer_name FROM answer a INNER JOIN quiz q ON a.quiz_id = q.id LEFT JOIN amoCRMStatuses s ON a.id = s.AnswerID @@ -2538,19 +2538,20 @@ WHERE a.result = true ` type GettingAmoUsersTrueResultsRow struct { - QuizID int64 `db:"quiz_id" json:"quiz_id"` - ID int64 `db:"id" json:"id"` - Result sql.NullBool `db:"result" json:"result"` - QuestionID int64 `db:"question_id" json:"question_id"` - Content sql.NullString `db:"content" json:"content"` - Session sql.NullString `db:"session" json:"session"` - Accesstoken string `db:"accesstoken" json:"accesstoken"` - Accountid int32 `db:"accountid" json:"accountid"` - Utms []int32 `db:"utms" json:"utms"` - Fieldsrule json.RawMessage `db:"fieldsrule" json:"fieldsrule"` - Performerid int32 `db:"performerid" json:"performerid"` - Stepid int32 `db:"stepid" json:"stepid"` - Pipelineid int32 `db:"pipelineid" json:"pipelineid"` + QuizID int64 `db:"quiz_id" json:"quiz_id"` + ID int64 `db:"id" json:"id"` + Result sql.NullBool `db:"result" json:"result"` + QuestionID int64 `db:"question_id" json:"question_id"` + Content sql.NullString `db:"content" json:"content"` + Session sql.NullString `db:"session" json:"session"` + Accesstoken string `db:"accesstoken" json:"accesstoken"` + Accountid int32 `db:"accountid" json:"accountid"` + Utms []int32 `db:"utms" json:"utms"` + Fieldsrule json.RawMessage `db:"fieldsrule" json:"fieldsrule"` + Performerid int32 `db:"performerid" json:"performerid"` + Stepid int32 `db:"stepid" json:"stepid"` + Pipelineid int32 `db:"pipelineid" json:"pipelineid"` + PerformerName string `db:"performer_name" json:"performer_name"` } func (q *Queries) GettingAmoUsersTrueResults(ctx context.Context) ([]GettingAmoUsersTrueResultsRow, error) { @@ -2576,6 +2577,7 @@ func (q *Queries) GettingAmoUsersTrueResults(ctx context.Context) ([]GettingAmoU &i.Performerid, &i.Stepid, &i.Pipelineid, + &i.PerformerName, ); err != nil { return nil, err }