gnegx

@@ -3,17 +3,17 @@ package domain
 import "time"
 import "time"
 
 
 //评估任务重复执行的方式
 //评估任务重复执行的方式
-type AssessTaskRepeatWay string
+// type AssessTaskRepeatWay string
 
 
-const (
-	AssessTaskRepeatDay         AssessTaskRepeatWay = "day"          //按天重复
-	AssessTaskRepeatWeek        AssessTaskRepeatWay = "week"         //按周重复
-	AssessTaskRepeatMonth       AssessTaskRepeatWay = "month"        //按月
-	AssessTaskRepeatMonthDouble AssessTaskRepeatWay = "month_double" //按双月
-	AssessTaskRepeatQuarter     AssessTaskRepeatWay = "quarter"      //按季度
-	AssessTaskRepeatYearHalf    AssessTaskRepeatWay = "year_half"    //按半年
-	AssessTaskRepeatYear        AssessTaskRepeatWay = "year"         //按年
-)
+// const (
+// 	AssessTaskRepeatDay         AssessTaskRepeatWay = "day"          //按天重复
+// 	AssessTaskRepeatWeek        AssessTaskRepeatWay = "week"         //按周重复
+// 	AssessTaskRepeatMonth       AssessTaskRepeatWay = "month"        //按月
+// 	AssessTaskRepeatMonthDouble AssessTaskRepeatWay = "month_double" //按双月
+// 	AssessTaskRepeatQuarter     AssessTaskRepeatWay = "quarter"      //按季度
+// 	AssessTaskRepeatYearHalf    AssessTaskRepeatWay = "year_half"    //按半年
+// 	AssessTaskRepeatYear        AssessTaskRepeatWay = "year"         //按年
+// )
 
 
 // 执行评估的任务列表
 // 执行评估的任务列表
 type StaffAssessTask struct {
 type StaffAssessTask struct {
@@ -25,11 +25,20 @@ type StaffAssessTask struct {
 	CycleName             string           `json:"cycleName"`             //对应周期的名称
 	CycleName             string           `json:"cycleName"`             //对应周期的名称
 	BeginTime             time.Time        `json:"beginTime"`             //绩效考核开始时间
 	BeginTime             time.Time        `json:"beginTime"`             //绩效考核开始时间
 	EndTime               time.Time        `json:"endTime"`               //绩效考核截止时间
 	EndTime               time.Time        `json:"endTime"`               //绩效考核截止时间
+	StepList              []AssessTaskStep `json:"steps"`                 //考评的流程
 	CreatedAt             time.Time        `json:"createdAt"`             //数据创建时间
 	CreatedAt             time.Time        `json:"createdAt"`             //数据创建时间
 	UpdatedAt             time.Time        `json:"updatedAt"`             //数据更新时间
 	UpdatedAt             time.Time        `json:"updatedAt"`             //数据更新时间
 	DeletedAt             time.Time        `json:"deletedAt"`             //数据删除时间
 	DeletedAt             time.Time        `json:"deletedAt"`             //数据删除时间
 }
 }
 
 
+//考评的流程
+type AssessTaskStep struct {
+	SortBy       int    `json:"sortBy"`       //排序
+	LinkNodeId   int    `json:"linkNodeId"`   //考评的流程id
+	LinkNodeName string `json:"linkNodeName"` //流程名称
+	LinkNodeType int    `json:"linkNodeType"` //流程类型 同evaluation_template.go->LinkNode.Type
+}
+
 type StaffAssessTaskRepository interface {
 type StaffAssessTaskRepository interface {
 	Save(param *StaffAssessTask) (*StaffAssessTask, error)
 	Save(param *StaffAssessTask) (*StaffAssessTask, error)
 	Remove(id int) error
 	Remove(id int) error