1. 增加员工绩效-项目管理-总览

2. 增加员工绩效-综合管理-成员列表

+package adapter
+
+import "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/dao"
+
+// MemberSummaryAdapter 综合管理-成员列表
+type MemberSummaryAdapter struct {
+	dao.MemberSummaryAssess
+	DepartmentNames []string `json:"departmentNames"` // 被评估人部门列表
+	PositionNames   []string `json:"positionNames"`   // 被评估人职位列表
+}

+package query
+
+// MemberSummaryListCommand 员工绩效-综合管理-成员列表统计
+type MemberSummaryListCommand struct {
+	CycleId    int    `cname:"周期ID" json:"cycleId,string"`
+	UserName   string `cname:"用户名称" json:"userName"`
+	PageNumber int    `cname:"页码" json:"pageNumber"`
+	PageSize   int    `cname:"总数" json:"pageSize"`
+	CompanyId  int    `cname:"公司ID" json:"companyId"`
+	OperatorId int    `cname:"操作人ID" json:"operatorId"`
+}

@@ -25,6 +25,34 @@ func NewStaffAssessServeice() *StaffAssessServeice {
 	return newService
 }
 
+// 获取HRBP标记值
+func (srv StaffAssessServeice) getHRBP(transactionContext application.TransactionContext, companyId int, operatorId int) (int, error) {
+	roleRepo := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
+	roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{"transactionContext": transactionContext})
+	_, roleList, err := roleRepo.Find(map[string]interface{}{"type": domain.RoleTypeSystem, "companyId": companyId})
+	if err != nil {
+		return -1, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
+	}
+	_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{"companyId": companyId, "userId": operatorId})
+	if err != nil {
+		return -1, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
+	}
+	// 拥有HRBP权限
+	hrbp := -1
+	for _, v := range userRoleList {
+		for _, v2 := range roleList {
+			if v.RoleId == v2.Id {
+				hrbp = 1
+				break
+			}
+		}
+		if hrbp == 1 {
+			break
+		}
+	}
+	return hrbp, nil
+}
+
 // 获取我参与过的评估任务列表
 // func (srv StaffAssessServeice) SearchAssessTaskMe(param *query.SearchAssessMeQuery) (map[string]interface{}, error) {
 // 	transactionContext, err := factory.CreateTransactionContext(nil)

@@ -2,15 +2,17 @@ package service
 
 import (
 	"github.com/linmadan/egglib-go/core/application"
+	"github.com/linmadan/egglib-go/utils/tool_funs"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/adapter"
 	"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/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/dao"
+	"strconv"
 )
 
-//调试用，手动调用CreateStaffAssessTask
+// 调试用，手动调用CreateStaffAssessTask
 func (srv StaffAssessServeice) InvokCreateStaffAssessTask(param *command.CreateStaffAssessTask) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -42,30 +44,10 @@ func (srv StaffAssessServeice) QuerySummary(in *query.SummaryCommand) (map[strin
 		transactionContext.RollbackTransaction()
 	}()
 
-	roleRepo := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
-	roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{"transactionContext": transactionContext})
-	_, roleList, err := roleRepo.Find(map[string]interface{}{"type": domain.RoleTypeSystem, "companyId": in.CompanyId})
+	hrbp, err := srv.getHRBP(transactionContext, in.CompanyId, in.OperatorId)
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
-	}
-	_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{"companyId": in.CompanyId, "userId": in.OperatorId})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
-	}
-	// 拥有HRBP权限
-	hrbp := -1
-	for _, v := range userRoleList {
-		for _, v2 := range roleList {
-			if v.RoleId == v2.Id {
-				hrbp = 1
-				break
-			}
-		}
-		if hrbp == 1 {
-			break
-		}
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
-
 	assessDao := dao.NewStaffAssessDao(map[string]interface{}{"transactionContext": transactionContext})
 	data, err := assessDao.SummaryAssess(in.CompanyId, in.OperatorId, in.CycleId, in.BeginDay, hrbp)
 	if err != nil {
@@ -127,3 +109,111 @@ func (srv StaffAssessServeice) QuerySummary(in *query.SummaryCommand) (map[strin
 	}
 	return map[string]interface{}{"list": []adapter.SummaryBlock{self, invite, inviteAssess, supper}}, nil
 }
+
+func (srv StaffAssessServeice) QueryMemberSummary(in *query.MemberSummaryListCommand) (map[string]interface{}, error) {
+	transactionContext, err := factory.ValidateStartTransaction(in)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+
+	hrbp, err := srv.getHRBP(transactionContext, in.CompanyId, in.OperatorId)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	assessDao := dao.NewStaffAssessDao(map[string]interface{}{"transactionContext": transactionContext})
+	userRepository := factory.CreateUserRepository(map[string]interface{}{"transactionContext": transactionContext})
+	departmentRepository := factory.CreateDepartmentRepository(map[string]interface{}{"transactionContext": transactionContext})
+	positionRepository := factory.CreatePositionRepository(map[string]interface{}{"transactionContext": transactionContext})
+
+	total, list, err := assessDao.MemberSummaryList(in.UserName, in.CompanyId, in.OperatorId, in.CycleId, hrbp, in.PageNumber, in.PageSize)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	userMap := map[int]*domain.User{}
+	departmentMap := map[int]*domain.Department{}
+	positionMap := map[int]*domain.Position{}
+
+	userIds := make([]int, 0)
+	for i := range list {
+		id, _ := strconv.Atoi(list[i].TargetUserId)
+		userIds = append(userIds, id)
+	}
+	if len(userIds) > 0 {
+		_, users, err := userRepository.Find(map[string]interface{}{"ids": userIds})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		}
+		for i := range users {
+			user := users[i]
+			userMap[int(user.Id)] = user
+
+			for i2 := range user.DepartmentId {
+				departmentMap[user.DepartmentId[i2]] = nil
+			}
+			for i2 := range user.PositionId {
+				positionMap[user.PositionId[i2]] = nil
+			}
+		}
+		departmentIds := make([]int, 0)
+		positionIds := make([]int, 0)
+		for k := range departmentMap {
+			departmentIds = append(departmentIds, k)
+		}
+		for k := range positionMap {
+			positionIds = append(positionIds, k)
+		}
+
+		if len(departmentIds) > 0 {
+			_, departments, err := departmentRepository.Find(map[string]interface{}{"ids": departmentIds})
+			if err != nil {
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+			}
+			for i := range departments {
+				departmentMap[int(departments[i].Id)] = departments[i]
+			}
+		}
+
+		if len(positionIds) > 0 {
+			_, positions, err := positionRepository.Find(map[string]interface{}{"ids": positionIds})
+			if err != nil {
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+			}
+			for i := range positions {
+				positionMap[int(positions[i].Id)] = positions[i]
+			}
+		}
+	}
+
+	adapters := make([]adapter.MemberSummaryAdapter, 0)
+	for i := range list {
+		it := list[i]
+		id, _ := strconv.Atoi(it.TargetUserId)
+
+		out := adapter.MemberSummaryAdapter{MemberSummaryAssess: it}
+		if v := userMap[id]; v != nil {
+			out.DepartmentNames = make([]string, 0)
+			out.PositionNames = make([]string, 0)
+
+			for i := range v.DepartmentId {
+				if v := departmentMap[v.DepartmentId[i]]; v != nil {
+					out.DepartmentNames = append(out.DepartmentNames, v.Name)
+				}
+			}
+			for i := range v.PositionId {
+				if v := positionMap[v.PositionId[i]]; v != nil {
+					out.PositionNames = append(out.PositionNames, v.Name)
+				}
+			}
+		}
+		adapters = append(adapters, out)
+	}
+
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+
+	return tool_funs.SimpleWrapGridMap(int64(total), adapters), nil
+}

@@ -88,38 +88,43 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 		_ = transactionContext.RollbackTransaction()
 	}()
 
-	roleRepo := factory.CreateRoleRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	_, roleList, err := roleRepo.Find(map[string]interface{}{
-		"type":      domain.RoleTypeSystem,
-		"companyId": param.CompanyId,
-	})
+	hrbp, err := srv.getHRBP(transactionContext, param.CompanyId, param.OperaterId)
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
-	}
-	_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
-		"companyId": param.CompanyId,
-		"userId":    param.OperaterId,
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
-	}
-	hrbp := -1
-	for _, v := range userRoleList {
-		for _, v2 := range roleList {
-			if v.RoleId == v2.Id {
-				hrbp = 1
-				break
-			}
-		}
-		if hrbp == 1 {
-			break
-		}
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
+
+	//roleRepo := factory.CreateRoleRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//_, roleList, err := roleRepo.Find(map[string]interface{}{
+	//	"type":      domain.RoleTypeSystem,
+	//	"companyId": param.CompanyId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
+	//}
+	//_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
+	//	"companyId": param.CompanyId,
+	//	"userId":    param.OperaterId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
+	//}
+	//hrbp := -1
+	//for _, v := range userRoleList {
+	//	for _, v2 := range roleList {
+	//		if v.RoleId == v2.Id {
+	//			hrbp = 1
+	//			break
+	//		}
+	//	}
+	//	if hrbp == 1 {
+	//		break
+	//	}
+	//}
 	assessDao := dao.NewStaffAssessDao(map[string]interface{}{
 		"transactionContext": transactionContext,
 	})
@@ -225,38 +230,42 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ListAssessContentCy
 		_ = transactionContext.RollbackTransaction()
 	}()
 
-	roleRepo := factory.CreateRoleRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	_, roleList, err := roleRepo.Find(map[string]interface{}{
-		"type":      domain.RoleTypeSystem,
-		"companyId": param.CompanyId,
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
-	}
-	_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
-		"companyId": param.CompanyId,
-		"userId":    param.OperaterId,
-	})
+	hrbp, err := srv.getHRBP(transactionContext, param.CompanyId, param.OperaterId)
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
-	}
-	hrbp := -1
-	for _, v := range userRoleList {
-		for _, v2 := range roleList {
-			if v.RoleId == v2.Id {
-				hrbp = 1
-				break
-			}
-		}
-		if hrbp == 1 {
-			break
-		}
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
+	//roleRepo := factory.CreateRoleRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//_, roleList, err := roleRepo.Find(map[string]interface{}{
+	//	"type":      domain.RoleTypeSystem,
+	//	"companyId": param.CompanyId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
+	//}
+	//_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
+	//	"companyId": param.CompanyId,
+	//	"userId":    param.OperaterId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
+	//}
+	//hrbp := -1
+	//for _, v := range userRoleList {
+	//	for _, v2 := range roleList {
+	//		if v.RoleId == v2.Id {
+	//			hrbp = 1
+	//			break
+	//		}
+	//	}
+	//	if hrbp == 1 {
+	//		break
+	//	}
+	//}
 	assessDao := dao.NewStaffAssessDao(map[string]interface{}{
 		"transactionContext": transactionContext,
 	})
@@ -457,38 +466,42 @@ func (srv StaffAssessServeice) AnalysisData(param *query.ListAssessContentCycleD
 		_ = transactionContext.RollbackTransaction()
 	}()
 
-	roleRepo := factory.CreateRoleRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
-		"transactionContext": transactionContext,
-	})
-	_, roleList, err := roleRepo.Find(map[string]interface{}{
-		"type":      domain.RoleTypeSystem,
-		"companyId": param.CompanyId,
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
-	}
-	_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
-		"companyId": param.CompanyId,
-		"userId":    param.OperaterId,
-	})
+	hrbp, err := srv.getHRBP(transactionContext, param.CompanyId, param.OperaterId)
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
-	}
-	hrbp := -1
-	for _, v := range userRoleList {
-		for _, v2 := range roleList {
-			if v.RoleId == v2.Id {
-				hrbp = 1
-				break
-			}
-		}
-		if hrbp == 1 {
-			break
-		}
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
+	//roleRepo := factory.CreateRoleRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//roleUserRepo := factory.CreateRoleUserRepository(map[string]interface{}{
+	//	"transactionContext": transactionContext,
+	//})
+	//_, roleList, err := roleRepo.Find(map[string]interface{}{
+	//	"type":      domain.RoleTypeSystem,
+	//	"companyId": param.CompanyId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取角色信息列表"+err.Error())
+	//}
+	//_, userRoleList, err := roleUserRepo.Find(map[string]interface{}{
+	//	"companyId": param.CompanyId,
+	//	"userId":    param.OperaterId,
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息列表"+err.Error())
+	//}
+	//hrbp := -1
+	//for _, v := range userRoleList {
+	//	for _, v2 := range roleList {
+	//		if v.RoleId == v2.Id {
+	//			hrbp = 1
+	//			break
+	//		}
+	//	}
+	//	if hrbp == 1 {
+	//		break
+	//	}
+	//}
 	assessDao := dao.NewStaffAssessDao(map[string]interface{}{
 		"transactionContext": transactionContext,
 	})

@@ -502,6 +502,156 @@ func (d *StaffAssessDao) SummaryAssess(companyId int, operatorId int, cycleId in
 	return result, err
 }
 
+type MemberSummaryAssess struct {
+	TargetUserId    string `json:"targetUserId"`    // 被评估人的id
+	TargetUserName  string `json:"targetUserName"`  // 被评估人名称
+	SelfCompleted   int    `json:"selfCompleted"`   // 自评完成数量
+	SupperCompleted int    `json:"supperCompleted"` // 上级评价完成数量
+	InviteCompleted int    `json:"inviteCompleted"` // 邀请完成数量
+	InviteTotal     int    `json:"inviteTotal"`     // 邀请总数
+}
+
+func (d *StaffAssessDao) MemberSummaryList(likeUserName string, companyId int, operatorId int, cycleId int, hrbp int, pageNumber int, pageSize int) (int, []MemberSummaryAssess, error) {
+	limit := pageSize
+	if limit < 0 {
+		limit = 20
+	}
+	offset := limit * (pageNumber - 1)
+	if offset < 0 {
+		offset = 0
+	}
+
+	sqlString := `
+	set time zone 'PRC';
+	with t_user_department as (
+		select "user".id as user_id ,jsonb_array_elements_text ("user".department_id)  as depart_id from "user" 
+		where "user".company_id= %d and "user".deleted_at  isnull
+	),
+	t_department as (
+		select  department.id::text  as depart_id  from  department where charge_user_ids @>'[%d]' 
+		and "department".deleted_at  isnull 
+	),
+	-- 部门主管（所有下级用户ID）
+	t_user_1 as (
+		select t_user_department.user_id::text from t_user_department
+		join t_department on t_user_department.depart_id = t_department.depart_id
+	),
+	-- 如果是HRBP
+	t_project_1 as(
+		select evaluation_project.id as project_id
+		from evaluation_project 
+		where evaluation_project.cycle_id =%d
+		and evaluation_project.hr_bp = %d
+		and evaluation_project.deleted_at isnull
+	),
+	-- 如果的项目管理员
+	t_project_2 as(
+		select evaluation_project.id as project_id
+		from evaluation_project 
+		where evaluation_project.cycle_id =%d
+		and evaluation_project.pmp =1
+		and evaluation_project.pmp_ids @>'["%d"]'
+		and evaluation_project.deleted_at isnull
+	),
+	-- 合并数据
+	t_project_3 as (
+		select t_project_2.project_id from t_project_2
+		union 
+		select t_project_1.project_id from t_project_1
+	),
+	-- 初步过滤数据
+	t_staff_assess_0 as (
+		select 
+        staff_assess.id as assess_id,
+		staff_assess.cycle_id,
+		staff_assess.target_user->>'userId' as target_user_id,
+		staff_assess.target_user->>'userName' as target_user_name,
+		staff_assess.evaluation_project_id,
+        staff_assess.types,
+        staff_assess.status
+		from staff_assess
+		join staff_assess_task on staff_assess.staff_assess_task_id = staff_assess_task.id 
+		and staff_assess_task.deleted_at isnull 
+		where staff_assess.cycle_id = %d 
+	),
+	-- 根据查看权限过滤合并数据
+	merge_assess as (
+		( select 
+        t_staff_assess_0.assess_id,
+		t_staff_assess_0.target_user_id,
+		t_staff_assess_0.target_user_name,
+		t_staff_assess_0.cycle_id,
+        t_staff_assess_0.evaluation_project_id,
+        t_staff_assess_0.types,
+        t_staff_assess_0.status
+		from t_staff_assess_0 
+		join t_project_3 on t_staff_assess_0.evaluation_project_id = t_project_3.project_id
+        ) union 
+        ( select 
+        t_staff_assess_0.assess_id,
+		t_staff_assess_0.target_user_id,
+		t_staff_assess_0.target_user_name,
+		t_staff_assess_0.cycle_id,
+        t_staff_assess_0.evaluation_project_id,
+        t_staff_assess_0.types,
+        t_staff_assess_0.status
+		from t_staff_assess_0 
+		join t_user_1 on t_staff_assess_0.target_user_id = t_user_1.user_id
+		)
+	)
+	`
+	params := []interface{}{companyId, operatorId, cycleId, hrbp, cycleId, operatorId, cycleId}
+	// 筛选结果的所有评估数据
+	sqlString = fmt.Sprintf(sqlString, params...)
+
+	// 根据用户ID进行分组
+	groupString := ` 
+    SELECT 
+	    merge_assess.target_user_id,
+		merge_assess.target_user_name,
+		SUM ( CASE WHEN merge_assess.types = 'self' AND merge_assess.status = 'completed' THEN 1 ELSE 0 END ) AS self_completed,
+		SUM ( CASE WHEN merge_assess.types = 'supper' AND merge_assess.status = 'completed' THEN 1 ELSE 0 END ) AS supper_completed,
+		SUM ( CASE WHEN ( merge_assess.types = 'invite_diff_super' OR merge_assess.types = 'invite_same_super' ) AND merge_assess.status = 'completed' THEN 1 ELSE 0 END ) AS invite_completed,
+		SUM ( CASE WHEN merge_assess.types = 'invite_diff_super' OR merge_assess.types = 'invite_same_super' THEN 1 ELSE 0 END ) AS invite_total
+    `
+	whereFrom := `
+    FROM 
+	merge_assess 
+	WHERE 1=1 
+    `
+	if len(likeUserName) > 0 {
+		whereFrom += fmt.Sprintf(" AND merge_assess.target_user_name LIKE '%s'", "%"+likeUserName+"%")
+	}
+	groupBy := ` 
+    GROUP BY 
+    merge_assess.target_user_id,
+    merge_assess.target_user_name
+	ORDER BY 
+    convert_to( merge_assess.target_user_name, 'GBK' )
+    `
+	groupString += whereFrom
+	groupString += groupBy
+	groupString = fmt.Sprintf("%s limit %d offset %d", groupString, limit, offset)
+
+	// 查询所有目标用户数量
+	countSql := ` SELECT COUNT ( DISTINCT merge_assess.target_user_id ) ` + whereFrom
+
+	tx := d.transactionContext.PgTx
+	var result = make([]MemberSummaryAssess, 0)
+	_, err := tx.Query(&result, sqlString+groupString)
+	if err != nil {
+		return 0, result, err
+	}
+
+	var total int // 获取总数量
+	_, err = tx.QueryOne(pg.Scan(&total), sqlString+countSql)
+	if err != nil {
+		return 0, result, err
+	}
+
+	return total, result, err
+}
+
 type ExportData1 struct {
 	AssessId            string
 	ContentId           int

@@ -359,7 +359,7 @@ func (c *StaffAssessController) SaveAssessCache() {
 	}
 }
 
-// QuerySummary 项目管理-查询总览
+// QuerySummary 员工绩效-项目管理-查询总览
 func (c *StaffAssessController) QuerySummary() {
 	srv := service.NewStaffAssessServeice()
 	in := &query.SummaryCommand{}
@@ -374,6 +374,21 @@ func (c *StaffAssessController) QuerySummary() {
 	}
 }
 
+// QueryMemberSummary 员工绩效-综合管理-成员列表统计
+func (c *StaffAssessController) QueryMemberSummary() {
+	srv := service.NewStaffAssessServeice()
+	in := &query.MemberSummaryListCommand{}
+	if err := c.Unmarshal(in); err != nil {
+		c.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+	} else {
+		if user := middlewares.GetUser(c.Ctx); user != nil {
+			in.CompanyId = int(user.CompanyId)
+			in.OperatorId = int(user.UserId)
+		}
+		c.Response(srv.QueryMemberSummary(in))
+	}
+}
+
 // 员工绩效-项目管理-矩阵分析
 func (c *StaffAssessController) AnalysisData() {
 	srv := service.NewStaffAssessServeice()

@@ -32,7 +32,8 @@ func init() {
 		web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo),               //通用获取员工评估的详情
 		web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo),               //通用保存员工评估的详情
 		web.NSCtrlPut("/info-cache", (*controllers.StaffAssessController).SaveAssessCache),        //通用保存员工评估的详情（缓存）
-		web.NSCtrlPost("/summary", (*controllers.StaffAssessController).QuerySummary),      //项目管理-总览
+		web.NSCtrlPost("/summary", (*controllers.StaffAssessController).QuerySummary),             //员工绩效-项目管理-总览
+		web.NSCtrlPost("/summary/users", (*controllers.StaffAssessController).QueryMemberSummary), //员工绩效-综合管理-成员列表
 		// 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),       //获取被评估员工的自评反馈详情