暂存

@@ -2,10 +2,10 @@ package query
 
 
 //获取员工被其他人评估的列表
 //获取员工被其他人评估的列表
 type ListTargetAssessQuery struct {
 type ListTargetAssessQuery struct {
-	PageNumber int    `json:"pageNumber"`
-	PageSize   int    `json:"pageSize"`
-	CompanyId  int    `json:"companyId"`         //
-	ExecutorId int    `json:"executorId,string"` //评估的执行人，必填
-	CycleId    int    `json:"cycleId"`           //评估周期id 必填
-	BeginDay   string `json:"beginDay"`          //评估任务的开始日期 2006-01-02
+	PageNumber   int    `json:"pageNumber"`
+	PageSize     int    `json:"pageSize"`
+	CompanyId    int    `json:"companyId"`           //
+	TargetUserId int    `json:"targetUserId,string"` //评估的执行人，必填
+	CycleId      int    `json:"cycleId"`             //评估周期id 必填
+	BeginDay     string `json:"beginDay"`            //评估任务的开始日期 2006-01-02
 }
 }

@@ -693,7 +693,44 @@ func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfA
 	return &result, nil
 	return &result, nil
 }
 }
 
 
-//根据周期和日期。获取员工的被其他人360评估的列表，
+//根据周期和日期。获取360评估的列表，员工的被其他人评估
 func (srv StaffAssessServeice) ListTargetUserInviteAssess(param *query.ListTargetAssessQuery) (map[string]interface{}, error) {
 func (srv StaffAssessServeice) ListTargetUserInviteAssess(param *query.ListTargetAssessQuery) (map[string]interface{}, error) {
-	return nil, nil
+
+	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,
+	})
+	//获取员工的评估
+	cnt, assessList, err := assessReps.Find(map[string]interface{}{
+		"cycleId":      param.CycleId,
+		"beginDay":     param.BeginDay,
+		"companyId":    param.CompanyId,
+		"targetUserId": param.TargetUserId,
+		"typesList":    []string{string(domain.AssessInviteSameSuper), string(domain.AssessInviteDiffSuper)},
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
+	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	var resultList []map[string]interface{}
+	for _, v := range assessList {
+		item := map[string]interface{}{
+			"id":         v.Id,
+			"targetUser": v.TargetUser,
+			"executor":   v.Executor,
+		}
+		resultList = append(resultList, item)
+	}
+	return tool_funs.SimpleWrapGridMap(int64(cnt), resultList), nil
 }
 }

@@ -297,16 +297,19 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 	t_department as (
 	t_department as (
 		select  department.id::text  as depart_id  from  department where charge_user_ids @>'[%d]'
 		select  department.id::text  as depart_id  from  department where charge_user_ids @>'[%d]'
 	),
 	),
+	-- 部门主管
 	t_user_1 as (
 	t_user_1 as (
 		select t_user_department.user_id::text from t_user_department
 		select t_user_department.user_id::text from t_user_department
 		join t_department on t_user_department.depart_id = t_department.depart_id
 		join t_department on t_user_department.depart_id = t_department.depart_id
 	),
 	),
+	-- 如果是hrbp
 	t_project_1 as(
 	t_project_1 as(
 		select evaluation_project.id as project_id
 		select evaluation_project.id as project_id
 		from evaluation_project 
 		from evaluation_project 
 		where evaluation_project.cycle_id =%d
 		where evaluation_project.cycle_id =%d
 		and evaluation_project.hr_bp = %d
 		and evaluation_project.hr_bp = %d
 	),
 	),
+	-- 如果的项目管理员
 	t_project_2 as(
 	t_project_2 as(
 		select evaluation_project.id as project_id
 		select evaluation_project.id as project_id
 		from evaluation_project 
 		from evaluation_project 
@@ -314,11 +317,13 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 		and evaluation_project.pmp =1
 		and evaluation_project.pmp =1
 		and evaluation_project.pmp_ids @>'["%d"]'
 		and evaluation_project.pmp_ids @>'["%d"]'
 	),
 	),
+	-- 合并数据
 	t_project_3 as (
 	t_project_3 as (
 		select t_project_2.project_id from t_project_2
 		select t_project_2.project_id from t_project_2
 		union 
 		union 
 		select t_project_1.project_id from t_project_1
 		select t_project_1.project_id from t_project_1
 	),
 	),
+	-- 初步过滤数据
 	t_staff_assess_0 as (
 	t_staff_assess_0 as (
 		select staff_assess.id as assess_id,
 		select staff_assess.id as assess_id,
 		staff_assess.target_user->>'userId' as target_user_id,
 		staff_assess.target_user->>'userId' as target_user_id,
@@ -330,6 +335,7 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 		and to_char(staff_assess.begin_time,'YYYY-MM-DD')='%s'
 		and to_char(staff_assess.begin_time,'YYYY-MM-DD')='%s'
 		and staff_assess."types" ='self'
 		and staff_assess."types" ='self'
 	),
 	),
+	-- 根据查看权限过滤合并数据
 	t_staff_assess_1 as (
 	t_staff_assess_1 as (
 		(select t_staff_assess_0.assess_id,
 		(select t_staff_assess_0.assess_id,
 		t_staff_assess_0.target_user_id,
 		t_staff_assess_0.target_user_id,

@@ -18,7 +18,7 @@ func init() {
 		web.NSCtrlPost("/cycle/day/content", (*controllers.StaffAssessController).ListAssessContentCycleDay),          //根据周期里的考核日期，获取员工填写评估内容列表
 		web.NSCtrlPost("/cycle/day/content", (*controllers.StaffAssessController).ListAssessContentCycleDay),          //根据周期里的考核日期，获取员工填写评估内容列表
 		web.NSCtrlPost("/cycle/day/content/export", (*controllers.StaffAssessController).ExportAssessContentCycleDay), //根据周期里的考核日期,导出员工填写评估内容列表
 		web.NSCtrlPost("/cycle/day/content/export", (*controllers.StaffAssessController).ExportAssessContentCycleDay), //根据周期里的考核日期,导出员工填写评估内容列表
 	)
 	)
-	// /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/list", (*controllers.StaffAssessController).AssessSelfMeList),                           //获取我的自评反馈列表