Merge remote-tracking branch 'origin/test' into test

 package adapter
 
 type ListInviteUserAssessResp struct {
-	LinkNodeName string              `json:"linkNodeName"`
-	LinkNodeId   int                 `json:"linkNodeId"`
-	LintNodeDesc string              `json:"lintNodeDesc"`
-	BeginDay     string              `json:"beginDay"`
-	CycleId      int                 `json:"cycleId"`
-	TableHeader  []ListTableHeader   `json:"tableHeader"`
-	List         []map[string]string `json:"list"`
-	Total        int                 `json:"total"`
+	LinkNodeName string                   `json:"linkNodeName"`
+	LinkNodeId   int                      `json:"linkNodeId"`
+	LintNodeDesc string                   `json:"lintNodeDesc"`
+	BeginDay     string                   `json:"beginDay"`
+	CycleId      int                      `json:"cycleId"`
+	TableHeader  []ListTableHeader        `json:"tableHeader"`
+	List         []map[string]interface{} `json:"list"`
+	Total        int                      `json:"total"`
 }
 type ListTableHeader struct {
 	Key  string `json:"key"`

 package adapter
 
 type ListSupperAssessResp struct {
-	AssessId        int    `json:"assessId"`        //
-	CycleId         int    `json:"cycleId"`         //周期id
-	BeginDay        string `json:"beginDay"`        //开始的日期
-	UserId          int    `json:"userId,string"`   //用户id
-	UserName        string `json:"userName"`        //用户名称
-	EndTime         string `json:"endTime"`         //截止时间
-	InviteTotal     int    `json:"inviteTota"`      //邀请总数
-	InviteCompleted int    `json:"inviteCompleted"` //邀请未完成
-	Status          string `json:"status"`          //评估任务是否填写完成
-	Department      string `json:"department"`      //部门
-	Position        string `json:"position"`        //职位
-	DutyTime        string `json:"dutyTime"`        //入职时间
+	StaffAssessTaskId int    `json:"staffAssessTaskId"`
+	AssessId          int    `json:"assessId"`        //
+	CycleId           int    `json:"cycleId"`         //周期id
+	BeginDay          string `json:"beginDay"`        //开始的日期
+	UserId            int    `json:"userId,string"`   //用户id
+	UserName          string `json:"userName"`        //用户名称
+	EndTime           string `json:"endTime"`         //截止时间
+	InviteTotal       int    `json:"inviteTota"`      //邀请总数
+	InviteCompleted   int    `json:"inviteCompleted"` //邀请未完成
+	Status            string `json:"status"`          //评估任务是否填写完成
+	Department        string `json:"department"`      //部门
+	Position          string `json:"position"`        //职位
+	DutyTime          string `json:"dutyTime"`        //入职时间
 }

@@ -1281,9 +1281,9 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
 		{Key: "endTime", Name: "360°评估截止日期"},
 	}
 	tableHeader = append(tableHeader, changeableHeader...)
-	listData := []map[string]string{}
+	listData := []map[string]interface{}{}
 	for _, v := range assessList {
-		m := map[string]string{
+		m := map[string]interface{}{
 			"userName": v.TargetUser.UserName,
 			"userId":   strconv.Itoa(v.TargetUser.UserId),
 			"status":   string(v.Status),

@@ -411,17 +411,18 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu
 		{Key: "endTime", Name: "360°评估截止日期"},
 	}
 	tableHeader = append(tableHeader, changeableHeader...)
-	listData := []map[string]string{}
+	listData := []map[string]interface{}{}
 	for _, v := range assessList {
-		m := map[string]string{
-			"userName": v.TargetUser.UserName,
-			"userId":   strconv.Itoa(v.TargetUser.UserId),
-			"status":   string(v.Status),
-			"cycleId":  strconv.FormatInt(v.CycleId, 10),
-			"beginDay": v.BeginTime.Local().Format("2006-01-02"),
-			"types":    string(v.Types),
-			"endTime":  v.EndTime.Local().Format("2006-01-02 15:04:05"),
-			"assessId": strconv.Itoa(v.Id),
+		m := map[string]interface{}{
+			"staffAssessTaskId": v.StaffAssessTaskId,
+			"userName":          v.TargetUser.UserName,
+			"userId":            strconv.Itoa(v.TargetUser.UserId),
+			"status":            string(v.Status),
+			"cycleId":           strconv.FormatInt(v.CycleId, 10),
+			"beginDay":          v.BeginTime.Local().Format("2006-01-02"),
+			"types":             string(v.Types),
+			"endTime":           v.EndTime.Local().Format("2006-01-02 15:04:05"),
+			"assessId":          strconv.Itoa(v.Id),
 		}
 		switch v.Status {
 		case domain.StaffAssessCompleted:
@@ -562,18 +563,19 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu
 	resultList := []adapter.ListSupperAssessResp{}
 	for _, v := range assessList {
 		item := adapter.ListSupperAssessResp{
-			AssessId:        v.Id,
-			CycleId:         int(v.CycleId),
-			BeginDay:        v.BeginTime.Local().Format("2006-01-02"),
-			UserId:          v.TargetUser.UserId,
-			UserName:        v.TargetUser.UserName,
-			EndTime:         v.EndTime.Local().Format("2006-01-02 15:04:05"),
-			InviteCompleted: 0,
-			Status:          string(v.Status),
-			InviteTotal:     5,
-			Department:      "",
-			Position:        "",
-			DutyTime:        "",
+			StaffAssessTaskId: v.StaffAssessTaskId,
+			AssessId:          v.Id,
+			CycleId:           int(v.CycleId),
+			BeginDay:          v.BeginTime.Local().Format("2006-01-02"),
+			UserId:            v.TargetUser.UserId,
+			UserName:          v.TargetUser.UserName,
+			EndTime:           v.EndTime.Local().Format("2006-01-02 15:04:05"),
+			InviteCompleted:   0,
+			Status:            string(v.Status),
+			InviteTotal:       5,
+			Department:        "",
+			Position:          "",
+			DutyTime:          "",
 		}
 		//填入部门
 		for _, vv := range v.TargetDepartment {