更新

@@ -1418,7 +1418,25 @@ func (srv StaffAssessServeice) ListExecutorSupperAssess(param *query.ListSupperA
 			log.Logger.Error("获取员工邀请的人完成情况" + err.Error())
 			log.Logger.Error("获取员工邀请的人完成情况" + err.Error())
 		}
 		}
 	}
 	}
-
+	assessTaskRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	assessTaskData, err := assessTaskRepo.FindOne(map[string]interface{}{
+		"id": param.AssessTaskId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取评估任务"+err.Error())
+	}
+	//我评估别人，被邀请评估
+	cnnt, _, err := assessRepo.Find(map[string]interface{}{
+		"staffAssessTaskId": param.AssessTaskId,
+		"executorId":        param.ExecutorId,
+		"typesList":         []string{string(domain.AssessSuper)},
+		"status":            domain.StaffAssessUncompleted,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取个人的评估环节"+err.Error())
+	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
@@ -1463,7 +1481,18 @@ func (srv StaffAssessServeice) ListExecutorSupperAssess(param *query.ListSupperA
 		}
 		}
 		resultList = append(resultList, item)
 		resultList = append(resultList, item)
 	}
 	}
-	return tool_funs.SimpleWrapGridMap(int64(cnt), resultList), nil
+	result := tool_funs.SimpleWrapGridMap(int64(cnt), resultList)
+	result["linkNodeName"] = ""
+	result["linkNodeId"] = ""
+	result["lintNodeDesc"] = ""
+	for _, v := range assessTaskData.StepList {
+		if v.LinkNodeType == domain.LinkNodeSuperiorAssessment {
+			result["linkNodeName"] = v.LinkNodeName
+			result["linkNodeId"] = fmt.Sprintf("%d", v.LinkNodeId)
+			result["lintNodeDesc"] = fmt.Sprintf("截止时间 %s 待评估 %d 人", v.EndTime.Local().Format("2006-01-02 15:04:05"), cnnt)
+		}
+	}
+	return result, nil
 }
 }
 
 
 // 根据staffAssessId 获取评估的填写信息
 // 根据staffAssessId 获取评估的填写信息
@@ -1720,6 +1749,7 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
 		"assessTaskId": param.AssessTaskId,
 		"assessTaskId": param.AssessTaskId,
 		"companyId":    param.CompanyId,
 		"companyId":    param.CompanyId,
 		"targetUserId": param.TargetUserId,
 		"targetUserId": param.TargetUserId,
+		"typesList":    param.Types,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())

@@ -258,3 +258,21 @@ func (c *StaffAssessController) ListTargetUserInviteAssess() {
 	data, err := srv.ListTargetUserAssess(paramReq)
 	data, err := srv.ListTargetUserAssess(paramReq)
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }
+
+func (c *StaffAssessController) ListTargetUserMeSupperAssess() {
+	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
+	userReq := middlewares.GetUser(c.Ctx)
+	paramReq.CompanyId = int(userReq.CompanyId)
+	paramReq.Types = []string{string(domain.AssessSuper)}
+	paramReq.TargetUserId = int(userReq.UserId)
+	data, err := srv.ListTargetUserAssess(paramReq)
+	c.Response(data, err)
+}

@@ -17,17 +17,18 @@ func init() {
 	// /v1/staff-assess/self/me/list
 	// /v1/staff-assess/self/me/list
 	assessNS := web.NewNamespace("/v1/staff-assess",
 	assessNS := web.NewNamespace("/v1/staff-assess",
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
-		web.NSCtrlPost("/self/me/list", (*controllers.StaffAssessController).AssessSelfMeList),                      //获取我的自评反馈列表
-		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessController).GetAssessSelfMeInfo),                   //获取我的自评反馈详情
-		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessController).GetAssessMeInviteUser),               //获取邀请的员工
-		web.NSCtrlPost("/me/save-invite-user", (*controllers.StaffAssessController).SaveAssessMeInviteUser),         //保存我邀请的员工
-		web.NSCtrlPost("/me/invite-user/select", (*controllers.StaffAssessController).SelectAssessInviteUser),       //选择我邀请的员工
-		web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessController).ListMeInviteUserAssess),      //我要执行的360评估的用户列表
-		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessController).ListMeSupperAssess),          //我要执行的360评估的用户列表
-		web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo),                                 //通用获取员工评估的详情
-		web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo),                                 //通用保存员工评估的详情
-		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).ListTargetUserInviteAssess), //获取被评估员工评估的详情
-		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessController).GetAssessTargetUserSelfInfo),  //获取被评估员工的自评反馈详情
+		web.NSCtrlPost("/self/me/list", (*controllers.StaffAssessController).AssessSelfMeList),                           //获取我的自评反馈列表
+		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessController).GetAssessSelfMeInfo),                        //获取我的自评反馈详情
+		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessController).GetAssessMeInviteUser),                    //获取邀请的员工
+		web.NSCtrlPost("/me/save-invite-user", (*controllers.StaffAssessController).SaveAssessMeInviteUser),              //保存我邀请的员工
+		web.NSCtrlPost("/me/invite-user/select", (*controllers.StaffAssessController).SelectAssessInviteUser),            //选择我邀请的员工
+		web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessController).ListMeInviteUserAssess),           //我要执行的360评估的用户列表
+		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessController).ListMeSupperAssess),               //我要执行的360评估的用户列表
+		web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo),                                      //通用获取员工评估的详情
+		web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo),                                      //通用保存员工评估的详情
+		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).ListTargetUserInviteAssess),      //获取被评估员工360评估的列表
+		web.NSCtrlPost("/me/target-user/supper/list", (*controllers.StaffAssessController).ListTargetUserMeSupperAssess), //获取我的上级评估的列表
+		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessController).GetAssessTargetUserSelfInfo),       //获取被评估员工的自评反馈详情
 
 
 	)
 	)
 	web.AddNamespace(assessTaskNS)
 	web.AddNamespace(assessTaskNS)