作者 Your Name

更新

... ... @@ -21,5 +21,5 @@ type AssessContent struct {
Name string `json:"name" comment:"名称"`
PromptTitle string `json:"promptTitle" comment:"提示项标题"`
PromptText string `json:"promptText" comment:"提示项正文"`
EntryItems []domain.EntryItem `json:"entryItems" comment:"填写项"`
EntryItems []*domain.EntryItem `json:"entryItems" comment:"填写项"`
}
... ...
... ... @@ -840,6 +840,7 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessInfoQuery) (
Name: v.Name,
PromptTitle: v.PromptTitle,
PromptText: v.PromptText,
EntryItems: v.EntryItems,
})
}
result.AssessContent = assessContent
... ...
... ... @@ -2,6 +2,7 @@ package pg
import (
"fmt"
"github.com/go-pg/pg/v10"
"github.com/go-pg/pg/v10/orm"
"github.com/linmadan/egglib-go/persistent/pg/comment"
... ... @@ -38,6 +39,8 @@ func init() {
&models.EvaluationCycle{},
&models.EvaluationCycleTemplate{},
&models.EvaluationProject{},
&models.StaffAssess{},
&models.StaffAssessTask{},
}
for _, model := range tables {
err := DB.Model(model).CreateTable(&orm.CreateTableOptions{
... ...
... ... @@ -12,12 +12,16 @@ type StaffAssess struct {
Id int `pg:",pk"` //id
CompanyId int `comment:"公司id"` //公司id
EvaluationProjectId int `comment:"对应的项目id"` //对应的项目id
EvaluationProjectName string
CycleId int64 `comment:"对应的周期id"` //对应的周期id
CycleName string
StaffAssessTaskId int
TargetUser domain.StaffDesc `comment:"被评估的目标用户"` //被评估的目标用户
TargetDepartment []domain.StaffDepartment `comment:"被评估的用户所在的部门"` //被评估的用户所在的部门
Executor domain.StaffDesc `comment:"填写评估的用户"` //填写评估的用户
Types string `comment:"填写评估对应的类型"` //填写评估对应的类型
LinkNodeId int `comment:"评估环节id"`
LinkNodeName string
Status string `comment:"评估的填写状态"` //评估的填写状态
BeginTime time.Time `comment:"开始时间"` //开始时间
EndTime time.Time `comment:"截止时间"` //截止时间
... ...
... ... @@ -26,11 +26,16 @@ func (repo *StaffAssessRepository) TransformToDomain(d *models.StaffAssess) *dom
Id: d.Id,
CompanyId: d.CompanyId,
EvaluationProjectId: d.EvaluationProjectId,
EvaluationProjectName: d.EvaluationProjectName,
CycleId: d.CycleId,
CycleName: d.CycleName,
StaffAssessTaskId: d.StaffAssessTaskId,
TargetUser: d.TargetUser,
TargetDepartment: d.TargetDepartment,
Executor: d.Executor,
Types: domain.StaffAssessType(d.Types),
LinkNodeId: d.LinkNodeId,
LinkNodeName: d.LinkNodeName,
Status: domain.StaffAssessStatus(d.Status),
BeginTime: d.BeginTime,
EndTime: d.EndTime,
... ... @@ -45,11 +50,16 @@ func (repo *StaffAssessRepository) Save(d *domain.StaffAssess) (*domain.StaffAss
Id: d.Id,
CompanyId: d.CompanyId,
EvaluationProjectId: d.EvaluationProjectId,
EvaluationProjectName: d.EvaluationProjectName,
CycleId: d.CycleId,
CycleName: d.CycleName,
StaffAssessTaskId: d.StaffAssessTaskId,
TargetUser: d.TargetUser,
TargetDepartment: d.TargetDepartment,
Executor: d.Executor,
Types: string(d.Types),
LinkNodeId: d.LinkNodeId,
LinkNodeName: d.LinkNodeName,
Status: string(d.Status),
BeginTime: d.BeginTime,
EndTime: d.EndTime,
... ...