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

@@ -7,7 +7,7 @@ type ListInviteUserAssessResp struct {
 	BeginDay     string                   `json:"beginDay"`
 	BeginDay     string                   `json:"beginDay"`
 	CycleId      int                      `json:"cycleId"`
 	CycleId      int                      `json:"cycleId"`
 	TableHeader  []ListTableHeader        `json:"tableHeader"`
 	TableHeader  []ListTableHeader        `json:"tableHeader"`
-	List         []map[string]string `json:"list"`
+	List         []map[string]interface{} `json:"list"`
 	Total        int                      `json:"total"`
 	Total        int                      `json:"total"`
 }
 }
 type ListTableHeader struct {
 type ListTableHeader struct {

 package adapter
 package adapter
 
 
 type ListSupperAssessResp struct {
 type ListSupperAssessResp struct {
+	StaffAssessTaskId int    `json:"staffAssessTaskId"`
 	AssessId          int    `json:"assessId"`        //
 	AssessId          int    `json:"assessId"`        //
 	CycleId           int    `json:"cycleId"`         //周期id
 	CycleId           int    `json:"cycleId"`         //周期id
 	BeginDay          string `json:"beginDay"`        //开始的日期
 	BeginDay          string `json:"beginDay"`        //开始的日期

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

@@ -411,9 +411,10 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu
 		{Key: "endTime", Name: "360°评估截止日期"},
 		{Key: "endTime", Name: "360°评估截止日期"},
 	}
 	}
 	tableHeader = append(tableHeader, changeableHeader...)
 	tableHeader = append(tableHeader, changeableHeader...)
-	listData := []map[string]string{}
+	listData := []map[string]interface{}{}
 	for _, v := range assessList {
 	for _, v := range assessList {
-		m := map[string]string{
+		m := map[string]interface{}{
+			"staffAssessTaskId": v.StaffAssessTaskId,
 			"userName":          v.TargetUser.UserName,
 			"userName":          v.TargetUser.UserName,
 			"userId":            strconv.Itoa(v.TargetUser.UserId),
 			"userId":            strconv.Itoa(v.TargetUser.UserId),
 			"status":            string(v.Status),
 			"status":            string(v.Status),
@@ -562,6 +563,7 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu
 	resultList := []adapter.ListSupperAssessResp{}
 	resultList := []adapter.ListSupperAssessResp{}
 	for _, v := range assessList {
 	for _, v := range assessList {
 		item := adapter.ListSupperAssessResp{
 		item := adapter.ListSupperAssessResp{
+			StaffAssessTaskId: v.StaffAssessTaskId,
 			AssessId:          v.Id,
 			AssessId:          v.Id,
 			CycleId:           int(v.CycleId),
 			CycleId:           int(v.CycleId),
 			BeginDay:          v.BeginTime.Local().Format("2006-01-02"),
 			BeginDay:          v.BeginTime.Local().Format("2006-01-02"),