Merge remote-tracking branch 'origin/test' into test

@@ -17,7 +17,7 @@ import (
 
 //员工绩效-项目管理
 
-//获取已被执行的周期列表
+// 获取已被执行的周期列表
 func (srv StaffAssessServeice) ListAllAssessCycle(companyid int) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -46,7 +46,7 @@ func (srv StaffAssessServeice) ListAllAssessCycle(companyid int) (map[string]int
 
 }
 
-//获取周期内的考核日期
+// 获取周期内的考核日期
 func (srv StaffAssessServeice) ListAllAssessCycleDay(param *query.ListAssessCycleDay) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -74,8 +74,8 @@ func (srv StaffAssessServeice) ListAllAssessCycleDay(param *query.ListAssessCycl
 	return result, nil
 }
 
-//根据周期id和日期获取 员工填写评估内容
-//有过滤查看权限
+// 根据周期id和日期获取 员工填写评估内容
+// 有过滤查看权限
 func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAssessContentCycleDay) (*adapter.ListUserAssessContent, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -173,6 +173,8 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserId"] = v.TargetUserId
 		changeableRows[v.TargetUserId]["assessId"] = v.AssessId
+		changeableRows[v.TargetUserId]["cycleId"] = v.CycleId
+		changeableRows[v.TargetUserId]["beginDay"] = v.BeginDay
 		if v.ContentId > 0 {
 			name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
 			key := fmt.Sprintf("k%d", i)

@@ -130,14 +130,14 @@ func (d *StaffAssessDao) CountAssessTaskMe(executorId int, companyId int) (int,
 	return result, err
 }
 
-//获取所以已经执行的评估周期
+// 获取所以已经执行的评估周期
 type AssessCycle struct {
 	CycleId   string `json:"cycleId"` //周期id
 	CompanyId string `json:"companyId"`
 	CycleName string `json:"cycleName"` //周期名称
 }
 
-//获取所以已经执行的评估周期
+// 获取所以已经执行的评估周期
 func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error) {
 	sqlStr := `select  
 	distinct 
@@ -159,7 +159,7 @@ func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error
 	return result, err
 }
 
-//获取评估周期中的绩效考核日期
+// 获取评估周期中的绩效考核日期
 type AssessCycleDay struct {
 	BeginDay  string `json:"beginDay"`
 	CycleId   int    `json:"cycleId"`
@@ -167,7 +167,7 @@ type AssessCycleDay struct {
 	CompanyId string `json:"companyId"`
 }
 
-//获取评估周期中的绩效考核日期
+// 获取评估周期中的绩效考核日期
 func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]AssessCycleDay, error) {
 	sqlStr := `select distinct staff_assess_task.begin_day ,
 	staff_assess_task.cycle_id ,
@@ -188,7 +188,7 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As
 	return result, err
 }
 
-//获取员工填写评估内容
+// 获取员工填写评估内容
 type UserAssessContent struct {
 	AssessId            string  `json:"assessId"`
 	ContentId           int     `json:"contentId"`
@@ -201,6 +201,7 @@ type UserAssessContent struct {
 	Category            string  `json:"category"`            //评估项分类
 	ContentName         string  `json:"contentName"`         //评估项名称
 	Weight              float64 `json:"weight"`              //权重
+	CycleId             string  `json:"cycleId"`             //周期id
 }
 
 type SearchConditin1 struct {
@@ -216,14 +217,14 @@ type SearchConditin1 struct {
 	Hrbp           int      //
 }
 
-//项目管理-成员列表 根据周期的id和日期获取员工填写的评估内容
-//companyId int 公司id
-//cycleId int, 评估周期id
-//userId int, 用户id,谁要查看数据
-//beginDay string, 周期中执行项目的时间
-//hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
-//limit int, 分页条数
-//offset int 分页偏移
+// 项目管理-成员列表 根据周期的id和日期获取员工填写的评估内容
+// companyId int 公司id
+// cycleId int, 评估周期id
+// userId int, 用户id,谁要查看数据
+// beginDay string, 周期中执行项目的时间
+// hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
+// limit int, 分页条数
+// offset int 分页偏移
 func (d *StaffAssessDao) SearchUserAssessContent(param SearchConditin1) ([]UserAssessContent, error) {
 	if param.Offset < 0 {
 		param.Offset = 0
@@ -234,7 +235,7 @@ func (d *StaffAssessDao) SearchUserAssessContent(param SearchConditin1) ([]UserA
 	sqlStr := ` select 
 	t_staff_assess_1.target_user_id,t_staff_assess_1.target_user_name,t_staff_assess_1.begin_day,
 	t_staff_assess_1.assess_id,staff_assess_content.id as content_id,
-	staff_assess_content.value ,staff_assess_content.sort_by ,
+	staff_assess_content.value ,staff_assess_content.sort_by ,t_staff_assess_1.cycle_id,
 	staff_assess_content.category ,staff_assess_content."name" as content_name ,
 	staff_assess_content.weight
 	from t_staff_assess_1
@@ -257,14 +258,14 @@ func (d *StaffAssessDao) SearchUserAssessContent(param SearchConditin1) ([]UserA
 	return result, err
 }
 
-//项目管理-成员列表  根据周期的id和日期获取员工填写的评估内容,数量统计
-//companyId int 公司id
-//cycleId int, 评估周期id
-//userId int, 用户id,谁要查看数据
-//beginDay string, 周期中执行项目的时间
-//hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
-//limit int, 分页条数
-//offset int 分页偏移
+// 项目管理-成员列表  根据周期的id和日期获取员工填写的评估内容,数量统计
+// companyId int 公司id
+// cycleId int, 评估周期id
+// userId int, 用户id,谁要查看数据
+// beginDay string, 周期中执行项目的时间
+// hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
+// limit int, 分页条数
+// offset int 分页偏移
 func (d *StaffAssessDao) CountUserAssess(param SearchConditin1) (int, error) {
 	sqlStr := ` select 
 	count( distinct t_staff_assess_1.target_user_id) cnt
@@ -284,14 +285,14 @@ func (d *StaffAssessDao) CountUserAssess(param SearchConditin1) (int, error) {
 	return result, err
 }
 
-//生成的sql 根据用户的查看权限 ,获取可查看的评估任务，
-//companyId int 公司id
-//cycleId int, 评估周期id
-//userId int, 用户id,谁要查看数据
-//beginDay string, 周期中执行项目的时间
-//hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
-//limit int, 分页条数
-//offset int 分页偏移
+// 生成的sql 根据用户的查看权限 ,获取可查看的评估任务，
+// companyId int 公司id
+// cycleId int, 评估周期id
+// userId int, 用户id,谁要查看数据
+// beginDay string, 周期中执行项目的时间
+// hrbp 是否搜索HRBP角色的用户可以查看，1：是;-1：否
+// limit int, 分页条数
+// offset int 分页偏移
 func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int, beginDay string, hrbp int, limit int, offset int) string {
 	sqlstr := `
 	set time zone 'PRC';
@@ -334,6 +335,7 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 	-- 初步过滤数据
 	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,
 		to_char(staff_assess.begin_time,'YYYY-MM-DD') as begin_day,
@@ -350,13 +352,15 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 		(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.begin_day
+		t_staff_assess_0.begin_day,
+		t_staff_assess_0.cycle_id
 		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.begin_day
+		t_staff_assess_0.begin_day,
+		t_staff_assess_0.cycle_id
 		from t_staff_assess_0
 		join t_user_1 on t_staff_assess_0.target_user_id=t_user_1.user_id
 		)
@@ -387,7 +391,7 @@ type ExportData1 struct {
 	Remark              []domain.AssessContemtRemark
 }
 
-//项目管理-成员列表  导出数据
+// 项目管理-成员列表  导出数据
 func (d *StaffAssessDao) ExportDataUserAssess(param SearchConditin1) ([]ExportData1, error) {
 	if param.Offset < 0 {
 		param.Offset = 0

@@ -100,8 +100,8 @@ func (c *StaffAssessControllerV2) GetAssessMeInviteUser() {
 	c.Response(data, err)
 }
 
-// 获取员工自评详情
-func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() {
+// 获取当前登录员工自评详情
+func (c *StaffAssessControllerV2) GetAssessSelfMeInfo() {
 	srv := service.NewStaffAssessServeice()
 	paramReq := &query.GetExecutorSelfAssessQuery{}
 	err := c.BindJSON(paramReq)
@@ -112,29 +112,30 @@ func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() {
 	}
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
+	paramReq.TargetUserId = int(userReq.UserId)
 	data, err := srv.GetAssessSelfInfoV2(paramReq)
 	c.Response(data, err)
 }
 
-// 获取当前登录员工自评详情
-func (c *StaffAssessControllerV2) GetAssessSelfMeInfo() {
+// 被评估的员工的评估列表-360评估
+func (c *StaffAssessControllerV2) ListTargetUserInviteAssess() {
 	srv := service.NewStaffAssessServeice()
-	paramReq := &query.GetExecutorSelfAssessQuery{}
+	paramReq := &query.ListTargetAssessQuery{}
 	err := c.BindJSON(paramReq)
 	if err != nil {
 		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
 		c.Response(nil, e)
 		return
 	}
+
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
-	paramReq.TargetUserId = int(userReq.UserId)
-	data, err := srv.GetAssessSelfInfoV2(paramReq)
+	data, err := srv.ListTargetUserInviteAssess(paramReq)
 	c.Response(data, err)
 }
 
-// 被评估的员工的评估列表-360评估
-func (c *StaffAssessControllerV2) ListTargetUserInviteAssess() {
+// 被评估的员工的评估列表-当前登录用户-上级评估
+func (c *StaffAssessControllerV2) ListTargetUserMeSupperAssess() {
 	srv := service.NewStaffAssessServeice()
 	paramReq := &query.ListTargetAssessQuery{}
 	err := c.BindJSON(paramReq)
@@ -143,15 +144,16 @@ func (c *StaffAssessControllerV2) ListTargetUserInviteAssess() {
 		c.Response(nil, e)
 		return
 	}
-
+	paramReq.CompanyId = 1
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
-	data, err := srv.ListTargetUserInviteAssess(paramReq)
+	paramReq.TargetUserId = int(userReq.UserId)
+	data, err := srv.ListTargetUserSuperAssess(paramReq)
 	c.Response(data, err)
 }
 
 // 被评估的员工的评估列表-上级评估
-func (c *StaffAssessControllerV2) ListTargetUserMeSupperAssess() {
+func (c *StaffAssessControllerV2) ListTargetUserSupperAssess() {
 	srv := service.NewStaffAssessServeice()
 	paramReq := &query.ListTargetAssessQuery{}
 	err := c.BindJSON(paramReq)
@@ -163,7 +165,22 @@ func (c *StaffAssessControllerV2) ListTargetUserMeSupperAssess() {
 	paramReq.CompanyId = 1
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
-	paramReq.TargetUserId = int(userReq.UserId)
 	data, err := srv.ListTargetUserSuperAssess(paramReq)
 	c.Response(data, err)
 }
+
+// 获取员工自评详情
+func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() {
+	srv := service.NewStaffAssessServeice()
+	paramReq := &query.GetExecutorSelfAssessQuery{}
+	err := c.BindJSON(paramReq)
+	if err != nil {
+		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
+		c.Response(nil, e)
+		return
+	}
+	userReq := middlewares.GetUser(c.Ctx)
+	paramReq.CompanyId = int(userReq.CompanyId)
+	data, err := srv.GetAssessSelfInfoV2(paramReq)
+	c.Response(data, err)
+}

@@ -48,8 +48,9 @@ func init() {
 		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess),               //我要执行的360评估的用户列表
 		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser),                    //获取邀请的员工
 		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo),       //获取被评估员工的自评反馈详情
-		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo),                        //获取当前周期里我的自评反馈详情
 		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessControllerV2).ListTargetUserInviteAssess),      //获取被评估员工360评估的列表
+		web.NSCtrlPost("/target-user/supper/list", (*controllers.StaffAssessControllerV2).ListTargetUserSupperAssess),      //获取被评估员工被上级评估的列表
+		web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo),                        //获取当前周期里我的自评反馈详情
 		web.NSCtrlPost("/me/target-user/supper/list", (*controllers.StaffAssessControllerV2).ListTargetUserMeSupperAssess), //获取我被上级评估的列表
 	)