修正一些问题

@@ -9,12 +9,14 @@ type AssessInfoResp struct {
 	CycleName             string                       `json:"cycleName"`             //周期名称
 	EvaluationProjectId   int                          `json:"evaluationProjectId"`   //项目id
 	EvaluationProjectName string                       `json:"evaluationProjectName"` //项目名称
+	LinkNodeId            int                          `json:"linkNodeId"`
+	LinkNodeName          string                       `json:"linkNodeName"`
 	BeginTime             string                       `json:"beginTime"`         //开始时间 2006-01-02 15:04:05
 	EndTime               string                       `json:"endTime"`           //结束时间 2006-01-02 15:04:05
 	Status                string                       `json:"status"`            //完成状态
 	TargetUserId          int                          `json:"targetUser"`        //目标用户
 	TargetUserName        string                       `json:"targetUserName"`    //目标用户名称
-	CompanyId             int                          `json:"companyId,string"`      //
+	CompanyId             int                          `json:"companyId,string,"` //
 	CompanyName           string                       `json:"companyName"`       //公司名称
 	SupperUser            string                       `json:"superUser"`         //目标用户的上级
 	DutyTime              string                       `json:"dutyTime"`          //入职时间                      //

@@ -6,5 +6,5 @@ type ListInviteUserAssessQuery struct {
 	UserName     string `json:"userName"`     //查询条件 员工的名称
 	CompanyId    int    `json:"companyId"`    //
 	ExecutorId   int    `json:"executorId"`   //评估的执行人，必填
-	AssessTaskkId int    `json:"assessTaskId"` //评估任务id 必填
+	AssessTaskId int    `json:"assessTaskId"` //评估任务id 必填
 }

@@ -887,6 +887,8 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessSelfInfoQuer
 		AssessId:              assessData.Id,
 		CycleId:               assessData.CycleId,
 		CycleName:             assessData.CycleName,
+		LinkNodeId:            assessData.LinkNodeId,
+		LinkNodeName:          assessData.LinkNodeName,
 		EvaluationProjectId:   assessData.EvaluationProjectId,
 		EvaluationProjectName: assessData.EvaluationProjectName,
 		BeginTime:             assessData.BeginTime.Local().Format("2006-01-02 15:04:05"),
@@ -1089,15 +1091,41 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
 	assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 	})
+
+	// assessTaskkRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{
+	// 	"transactionContext": transactionContext,
+	// })
 	//获取 executorId 对应的360评估任务 用户
 	cnt, assessList, err := assessRepo.Find(map[string]interface{}{
-		"staffAssessTaskId": param.AssessTaskkId,
+		"staffAssessTaskId": param.AssessTaskId,
 		"executorId":        param.ExecutorId,
 		"typesList":         []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
 	})
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
+	var assessContentList []*domain.StaffAssessContent
+	if len(assessList) > 0 {
+		//获取评估用的所有评估项
+		assessContentList, err = srv.getAssessSelfInfoUncompleted(transactionContext, assessList[0])
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估任务"+err.Error())
+		}
+	}
+	//可变的表格列
+	changeableHeader := []adapter.ListTableHeader{}
+	//列名与字段对应
+	keyMap := map[string]string{}
+	for i, v := range assessContentList {
+		name := fmt.Sprintf("%s-%s", v.Category, v.Name)
+		key := fmt.Sprintf("k%d", i)
+		keyMap[name] = key
+		changeableHeader = append(changeableHeader, adapter.ListTableHeader{
+			Key:  key,
+			Name: name,
+		})
+	}
+
 	// 获取已经填报的内容
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -1110,6 +1138,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
 		{Key: "types", Name: "360°评估关系"},
 		{Key: "endTime", Name: "360°评估截止日期"},
 	}
+	tableHeader = append(tableHeader, changeableHeader...)
 	listData := []map[string]string{}
 	for _, v := range assessList {
 		m := map[string]string{
@@ -1315,6 +1344,8 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada
 		AssessId:              assessData.Id,
 		CycleId:               assessData.CycleId,
 		CycleName:             assessData.CycleName,
+		LinkNodeId:            assessData.LinkNodeId,
+		LinkNodeName:          assessData.LinkNodeName,
 		EvaluationProjectId:   assessData.EvaluationProjectId,
 		EvaluationProjectName: assessData.EvaluationProjectName,
 		BeginTime:             assessData.BeginTime.Local().Format("2006-01-02 15:04:05"),
@@ -1481,7 +1512,7 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
 	}, nil
 }
 
-// 获取员工被评估的列表 ，类型是360邀请的
+// 获取员工被评估的列表
 func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserAssessQuery) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -1508,5 +1539,6 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
+
 	return tool_funs.SimpleWrapGridMap(int64(cnt), assessList), nil
 }

@@ -6,6 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/command"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/query"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/service"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 )
 
 type StaffAssessController struct {
@@ -225,3 +226,19 @@ func (c *StaffAssessController) SaveAssessInfo() {
 	data, err := srv.SaveAssessInfo(paramReq)
 	c.Response(data, err)
 }
+
+// 被评估的员工的评估列表-360评估
+func (c *StaffAssessController) ListTargetUserInviteAssess() {
+	srv := service.NewStaffAssessServeice()
+	paramReq := &query.ListTargetUserAssessQuery{}
+	err := c.BindJSON(paramReq)
+	if err != nil {
+		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
+		c.Response(nil, e)
+		return
+	}
+	paramReq.CompanyId = 1
+	paramReq.Types = []string{string(domain.AssessInviteSameSuper), string(domain.AssessInviteDiffSuper)}
+	data, err := srv.ListTargetUserAssess(paramReq)
+	c.Response(data, err)
+}

@@ -25,6 +25,7 @@ func init() {
 		web.NSCtrlPost("/self/info", (*controllers.StaffAssessController).GetAssessSelfInfo),                   //获取员工的自评反馈详情
 		web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo),                            //获取员工评估的详情
 		web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo),                            //保存员工评估的详情
+		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).GetAssessInfo),         //获取被评估员工评估的详情
 
 	)
 	web.AddNamespace(assessTaskNS)