allied-creation / performance · 提交

转到一个项目

作者 Your Name
提交 e493d602b621e1063e9bf66fdce42583d4cff5c4 2 个父辈 93b39154 b08534d1

Merge branch 'dev-tangxvhui' into test

内嵌 并排对比
正在显示 5 个修改的文件 包含 56 行增加 和 4 行删除
@@ -9,12 +9,14 @@ type AssessInfoResp struct { @@ -9,12 +9,14 @@ type AssessInfoResp struct {
9 CycleName string `json:"cycleName"` //周期名称 9 CycleName string `json:"cycleName"` //周期名称
10 EvaluationProjectId int `json:"evaluationProjectId"` //项目id 10 EvaluationProjectId int `json:"evaluationProjectId"` //项目id
11 EvaluationProjectName string `json:"evaluationProjectName"` //项目名称 11 EvaluationProjectName string `json:"evaluationProjectName"` //项目名称
  12 + LinkNodeId int `json:"linkNodeId"`
  13 + LinkNodeName string `json:"linkNodeName"`
12 BeginTime string `json:"beginTime"` //开始时间 2006-01-02 15:04:05 14 BeginTime string `json:"beginTime"` //开始时间 2006-01-02 15:04:05
13 EndTime string `json:"endTime"` //结束时间 2006-01-02 15:04:05 15 EndTime string `json:"endTime"` //结束时间 2006-01-02 15:04:05
14 Status string `json:"status"` //完成状态 16 Status string `json:"status"` //完成状态
15 TargetUserId int `json:"targetUser"` //目标用户 17 TargetUserId int `json:"targetUser"` //目标用户
16 TargetUserName string `json:"targetUserName"` //目标用户名称 18 TargetUserName string `json:"targetUserName"` //目标用户名称
17 - CompanyId int `json:"companyId,string"` // 19 + CompanyId int `json:"companyId,string,"` //
18 CompanyName string `json:"companyName"` //公司名称 20 CompanyName string `json:"companyName"` //公司名称
19 SupperUser string `json:"superUser"` //目标用户的上级 21 SupperUser string `json:"superUser"` //目标用户的上级
20 DutyTime string `json:"dutyTime"` //入职时间 // 22 DutyTime string `json:"dutyTime"` //入职时间 //
@@ -6,5 +6,5 @@ type ListInviteUserAssessQuery struct { @@ -6,5 +6,5 @@ type ListInviteUserAssessQuery struct {
6 UserName string `json:"userName"` //查询条件 员工的名称 6 UserName string `json:"userName"` //查询条件 员工的名称
7 CompanyId int `json:"companyId"` // 7 CompanyId int `json:"companyId"` //
8 ExecutorId int `json:"executorId"` //评估的执行人，必填 8 ExecutorId int `json:"executorId"` //评估的执行人，必填
9 - AssessTaskkId int `json:"assessTaskId"` //评估任务id 必填 9 + AssessTaskId int `json:"assessTaskId"` //评估任务id 必填
10 } 10 }
@@ -887,6 +887,8 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessSelfInfoQuer @@ -887,6 +887,8 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessSelfInfoQuer
887 AssessId: assessData.Id, 887 AssessId: assessData.Id,
888 CycleId: assessData.CycleId, 888 CycleId: assessData.CycleId,
889 CycleName: assessData.CycleName, 889 CycleName: assessData.CycleName,
  890 + LinkNodeId: assessData.LinkNodeId,
  891 + LinkNodeName: assessData.LinkNodeName,
890 EvaluationProjectId: assessData.EvaluationProjectId, 892 EvaluationProjectId: assessData.EvaluationProjectId,
891 EvaluationProjectName: assessData.EvaluationProjectName, 893 EvaluationProjectName: assessData.EvaluationProjectName,
892 BeginTime: assessData.BeginTime.Local().Format("2006-01-02 15:04:05"), 894 BeginTime: assessData.BeginTime.Local().Format("2006-01-02 15:04:05"),
@@ -1089,15 +1091,41 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU @@ -1089,15 +1091,41 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
1089 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{ 1091 assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{
1090 "transactionContext": transactionContext, 1092 "transactionContext": transactionContext,
1091 }) 1093 })
  1094 +
  1095 + // assessTaskkRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{
  1096 + // "transactionContext": transactionContext,
  1097 + // })
1092 //获取 executorId 对应的360评估任务 用户 1098 //获取 executorId 对应的360评估任务 用户
1093 cnt, assessList, err := assessRepo.Find(map[string]interface{}{ 1099 cnt, assessList, err := assessRepo.Find(map[string]interface{}{
1094 - "staffAssessTaskId": param.AssessTaskkId, 1100 + "staffAssessTaskId": param.AssessTaskId,
1095 "executorId": param.ExecutorId, 1101 "executorId": param.ExecutorId,
1096 "typesList": []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)}, 1102 "typesList": []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
1097 }) 1103 })
1098 if err != nil { 1104 if err != nil {
1099 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 1105 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
1100 } 1106 }
  1107 + var assessContentList []*domain.StaffAssessContent
  1108 + if len(assessList) > 0 {
  1109 + //获取评估用的所有评估项
  1110 + assessContentList, err = srv.getAssessSelfInfoUncompleted(transactionContext, assessList[0])
  1111 + if err != nil {
  1112 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估任务"+err.Error())
  1113 + }
  1114 + }
  1115 + //可变的表格列
  1116 + changeableHeader := []adapter.ListTableHeader{}
  1117 + //列名与字段对应
  1118 + keyMap := map[string]string{}
  1119 + for i, v := range assessContentList {
  1120 + name := fmt.Sprintf("%s-%s", v.Category, v.Name)
  1121 + key := fmt.Sprintf("k%d", i)
  1122 + keyMap[name] = key
  1123 + changeableHeader = append(changeableHeader, adapter.ListTableHeader{
  1124 + Key: key,
  1125 + Name: name,
  1126 + })
  1127 + }
  1128 +
1101 // 获取已经填报的内容 1129 // 获取已经填报的内容
1102 if err := transactionContext.CommitTransaction(); err != nil { 1130 if err := transactionContext.CommitTransaction(); err != nil {
1103 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 1131 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -1110,6 +1138,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU @@ -1110,6 +1138,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
1110 {Key: "types", Name: "360°评估关系"}, 1138 {Key: "types", Name: "360°评估关系"},
1111 {Key: "endTime", Name: "360°评估截止日期"}, 1139 {Key: "endTime", Name: "360°评估截止日期"},
1112 } 1140 }
  1141 + tableHeader = append(tableHeader, changeableHeader...)
1113 listData := []map[string]string{} 1142 listData := []map[string]string{}
1114 for _, v := range assessList { 1143 for _, v := range assessList {
1115 m := map[string]string{ 1144 m := map[string]string{
@@ -1315,6 +1344,8 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada @@ -1315,6 +1344,8 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada
1315 AssessId: assessData.Id, 1344 AssessId: assessData.Id,
1316 CycleId: assessData.CycleId, 1345 CycleId: assessData.CycleId,
1317 CycleName: assessData.CycleName, 1346 CycleName: assessData.CycleName,
  1347 + LinkNodeId: assessData.LinkNodeId,
  1348 + LinkNodeName: assessData.LinkNodeName,
1318 EvaluationProjectId: assessData.EvaluationProjectId, 1349 EvaluationProjectId: assessData.EvaluationProjectId,
1319 EvaluationProjectName: assessData.EvaluationProjectName, 1350 EvaluationProjectName: assessData.EvaluationProjectName,
1320 BeginTime: assessData.BeginTime.Local().Format("2006-01-02 15:04:05"), 1351 BeginTime: assessData.BeginTime.Local().Format("2006-01-02 15:04:05"),
@@ -1481,7 +1512,7 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma @@ -1481,7 +1512,7 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
1481 }, nil 1512 }, nil
1482 } 1513 }
1483 1514
1484 -// 获取员工被评估的列表 ，类型是360邀请的 1515 +// 获取员工被评估的列表
1485 func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserAssessQuery) (map[string]interface{}, error) { 1516 func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserAssessQuery) (map[string]interface{}, error) {
1486 transactionContext, err := factory.CreateTransactionContext(nil) 1517 transactionContext, err := factory.CreateTransactionContext(nil)
1487 if err != nil { 1518 if err != nil {
@@ -1508,5 +1539,6 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA @@ -1508,5 +1539,6 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
1508 if err := transactionContext.CommitTransaction(); err != nil { 1539 if err := transactionContext.CommitTransaction(); err != nil {
1509 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 1540 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
1510 } 1541 }
  1542 +
1511 return tool_funs.SimpleWrapGridMap(int64(cnt), assessList), nil 1543 return tool_funs.SimpleWrapGridMap(int64(cnt), assessList), nil
1512 } 1544 }
@@ -6,6 +6,7 @@ import ( @@ -6,6 +6,7 @@ import (
6 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/command" 6 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/command"
7 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/query" 7 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/query"
8 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/service" 8 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/service"
  9 + "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
9 ) 10 )
10 11
11 type StaffAssessController struct { 12 type StaffAssessController struct {
@@ -225,3 +226,19 @@ func (c *StaffAssessController) SaveAssessInfo() { @@ -225,3 +226,19 @@ func (c *StaffAssessController) SaveAssessInfo() {
225 data, err := srv.SaveAssessInfo(paramReq) 226 data, err := srv.SaveAssessInfo(paramReq)
226 c.Response(data, err) 227 c.Response(data, err)
227 } 228 }
  229 +
  230 +// 被评估的员工的评估列表-360评估
  231 +func (c *StaffAssessController) ListTargetUserInviteAssess() {
  232 + srv := service.NewStaffAssessServeice()
  233 + paramReq := &query.ListTargetUserAssessQuery{}
  234 + err := c.BindJSON(paramReq)
  235 + if err != nil {
  236 + e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
  237 + c.Response(nil, e)
  238 + return
  239 + }
  240 + paramReq.CompanyId = 1
  241 + paramReq.Types = []string{string(domain.AssessInviteSameSuper), string(domain.AssessInviteDiffSuper)}
  242 + data, err := srv.ListTargetUserAssess(paramReq)
  243 + c.Response(data, err)
  244 +}
@@ -25,6 +25,7 @@ func init() { @@ -25,6 +25,7 @@ func init() {
25 web.NSCtrlPost("/self/info", (*controllers.StaffAssessController).GetAssessSelfInfo), //获取员工的自评反馈详情 25 web.NSCtrlPost("/self/info", (*controllers.StaffAssessController).GetAssessSelfInfo), //获取员工的自评反馈详情
26 web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo), //获取员工评估的详情 26 web.NSCtrlPost("/info", (*controllers.StaffAssessController).GetAssessInfo), //获取员工评估的详情
27 web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo), //保存员工评估的详情 27 web.NSCtrlPut("/info", (*controllers.StaffAssessController).SaveAssessInfo), //保存员工评估的详情
  28 + web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).GetAssessInfo), //获取被评估员工评估的详情
28 29
29 ) 30 )
30 web.AddNamespace(assessTaskNS) 31 web.AddNamespace(assessTaskNS)