更新

@@ -6,6 +6,7 @@ type AssessTaskDescQuery struct {
 	CompanyId    int `json:"companyId"`    //当前登录的公司
 	CompanyId    int `json:"companyId"`    //当前登录的公司
 }
 }
 
 
+//获取我的项目周期进度描述
 type AssessTaskDescV2Query struct {
 type AssessTaskDescV2Query struct {
 	CycleId   int    `json:"cycle"`
 	CycleId   int    `json:"cycle"`
 	BeginDay  string `json:"beginDay"`
 	BeginDay  string `json:"beginDay"`

+package query
+
+// 根据周期和日期，获取员工的自评内容
+type GetExecutorSelfAssessQuery struct {
+	CompanyId  int    `json:"companyId"`         //
+	ExecutorId int    `json:"executorId,string"` //评估的执行人，必填
+	CycleId    int    `json:"cycleId"`           //评估周期id 必填
+	BeginDay   string `json:"beginDay"`          //评估任务的开始日期 2006-01-02
+}

-package query
-
-type ListAssessInviteUserQuery struct {
-	CompanyId int    `json:"companyId"` //对公司
-	UserId    int    `json:"userId"`    //被评估的员工id
-	CycleId   int    `json:"CycleId"`   //评估任务的周期id
-	BeginDay  string `json:"beginDay"`  //日期
-}

 package query
 package query
 
 
+// 根据周期和日期获取我要执行的的360评估，用户列表和评估填写的值
 type ListExecutorAssessQuery struct {
 type ListExecutorAssessQuery struct {
 	PageNumber int    `json:"pageNumber"`
 	PageNumber int    `json:"pageNumber"`
 	PageSize   int    `json:"pageSize"`
 	PageSize   int    `json:"pageSize"`

+package query
+
+//根据周期和日期，获取员工邀请评估的人员
+type ListInviteUserQuery struct {
+	CompanyId    int    `json:"companyId"`     //对公司
+	TargetUserId int    `json:"userId,string"` //被评估的员工id
+	CycleId      int    `json:"CycleId"`       //评估任务的周期id
+	BeginDay     string `json:"beginDay"`      //日期
+}

 package query
 package query
 
 
+// 获取我的项目周期列表
 type SearchAssessMeQuery struct {
 type SearchAssessMeQuery struct {
 	UserId     int `json:"userId"`     // 当前登录人的用户id
 	UserId     int `json:"userId"`     // 当前登录人的用户id
 	CompanyId  int `json:"companyId"`  //当前登录人的公司Id
 	CompanyId  int `json:"companyId"`  //当前登录人的公司Id

@@ -218,7 +218,7 @@ func (srv StaffAssessServeice) AssessTaskDescV2(param *query.AssessTaskDescV2Que
 }
 }
 
 
 //根据周期获取，我的自评任务添加的邀请人
 //根据周期获取，我的自评任务添加的邀请人
-func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListAssessInviteUserQuery) (*adapter.AssessInviteUserResp, error) {
+func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListInviteUserQuery) (*adapter.AssessInviteUserResp, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -240,7 +240,7 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListAssessInvi
 	_, myAssessTask, err := assessTaskRepo.Find(map[string]interface{}{
 	_, myAssessTask, err := assessTaskRepo.Find(map[string]interface{}{
 		"cycleId":    param.CycleId,
 		"cycleId":    param.CycleId,
 		"beginDay":   param.BeginDay,
 		"beginDay":   param.BeginDay,
-		"executorId": param.UserId,
+		"executorId": param.TargetUserId,
 		"limit":      1,
 		"limit":      1,
 	})
 	})
 	if err != nil {
 	if err != nil {
@@ -256,7 +256,7 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListAssessInvi
 	_, assessList, err := assessReps.Find(map[string]interface{}{
 	_, assessList, err := assessReps.Find(map[string]interface{}{
 		"typesList":         []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
 		"typesList":         []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
 		"staffAssessTaskId": assessTaskData.Id,
 		"staffAssessTaskId": assessTaskData.Id,
-		"targetUserId":      param.UserId,
+		"targetUserId":      param.TargetUserId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, "获取个人邀请列表"+err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, "获取个人邀请列表"+err.Error())
@@ -292,7 +292,7 @@ func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListAssessInvi
 }
 }
 
 
 // 根据周期和日期获取我要执行的的360评估，用户列表和评估填写的值
 // 根据周期和日期获取我要执行的的360评估，用户列表和评估填写的值
-func (srv StaffAssessServeice) ListExecutorDayInviteAssess(param *query.ListExecutorAssessQuery) (
+func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecutorAssessQuery) (
 	*adapter.ListInviteUserAssessResp, error) {
 	*adapter.ListInviteUserAssessResp, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
@@ -459,7 +459,7 @@ func (srv StaffAssessServeice) ListExecutorDayInviteAssess(param *query.ListExec
 }
 }
 
 
 //根据周期和日期获取我需要执行的上级评估成员列表
 //根据周期和日期获取我需要执行的上级评估成员列表
-func (srv StaffAssessServeice) ListExecutorDaySupperAssess(param *query.ListExecutorAssessQuery) (map[string]interface{}, error) {
+func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecutorAssessQuery) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -605,3 +605,87 @@ func (srv StaffAssessServeice) ListExecutorDaySupperAssess(param *query.ListExec
 	}
 	}
 	return result, nil
 	return result, nil
 }
 }
+
+//根据周期和日期，获取员工的自评内容
+func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfAssessQuery) (*adapter.AssessInfoResp, error) {
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+	assessReps := factory.CreateStaffAssessRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	// 获取员工的评估
+	_, assessList, err := assessReps.Find(map[string]interface{}{
+		"companyId":  param.CompanyId,
+		"executorId": param.ExecutorId,
+		"cycleId":    param.CycleId,
+		"beginDay":   param.BeginDay,
+		"typesList":  []string{string(domain.AssessSelf)},
+		"limit":      1,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
+	}
+	if len(assessList) == 0 {
+		return &adapter.AssessInfoResp{}, nil
+	}
+	assessData := assessList[0]
+
+	assessContentList := []*domain.StaffAssessContent{}
+	if assessData.Status == domain.StaffAssessCompleted {
+		//已完成
+		assessContentRepo := factory.CreateStaffAssessContentRepository(map[string]interface{}{
+			"transactionContext": transactionContext,
+		})
+		_, assessContentList, err = assessContentRepo.Find(map[string]interface{}{
+			"staffAssessId": assessData.Id,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取项目填写内容"+err.Error())
+		}
+	} else if assessData.Status == domain.StaffAssessUncompleted {
+		//未完成
+		assessContentList, err = srv.getAssessSelfInfoUncompleted(transactionContext, assessData)
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取项目填写内容"+err.Error())
+		}
+	}
+
+	//获取员工描述
+	staffDesc, _ := srv.getStaffDescrip(transactionContext, int64(param.ExecutorId))
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	result := adapter.AssessInfoResp{
+		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"),
+		EndTime:               assessData.EndTime.Local().Format("2006-01-02 15:04:05"),
+		Status:                string(assessData.Status),
+		TargetUserId:          assessData.TargetUser.UserId,
+		TargetUserName:        assessData.TargetUser.UserName,
+		CompanyId:             assessData.CompanyId,
+		CompanyName:           "",
+		SupperUser:            "",
+		DutyTime:              "",
+		AssessContent:         assessContentList,
+	}
+	if staffDesc != nil {
+		result.CompanyName = staffDesc.CompanyName
+		result.SupperUser = staffDesc.SupperUserName
+		result.DutyTime = staffDesc.DutyTime
+	}
+	return &result, nil
+}