allied-creation / performance · 提交

转到一个项目

作者 郑周
提交 a4440b6c81e4dbe6085fa5b2afe0418824d46d6b 2 个父辈 ea054394 5c561804

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 47 行增加 和 44 行删除
1 package adapter 1 package adapter
2 2
3 type ListInviteUserAssessResp struct { 3 type ListInviteUserAssessResp struct {
4 - LinkNodeName string `json:"linkNodeName"`  
5 - LinkNodeId int `json:"linkNodeId"`  
6 - LintNodeDesc string `json:"lintNodeDesc"`  
7 - BeginDay string `json:"beginDay"`  
8 - CycleId int `json:"cycleId"`  
9 - TableHeader []ListTableHeader `json:"tableHeader"`  
10 - List []map[string]string `json:"list"`  
11 - Total int `json:"total"` 4 + LinkNodeName string `json:"linkNodeName"`
  5 + LinkNodeId int `json:"linkNodeId"`
  6 + LintNodeDesc string `json:"lintNodeDesc"`
  7 + BeginDay string `json:"beginDay"`
  8 + CycleId int `json:"cycleId"`
  9 + TableHeader []ListTableHeader `json:"tableHeader"`
  10 + List []map[string]interface{} `json:"list"`
  11 + Total int `json:"total"`
12 } 12 }
13 type ListTableHeader struct { 13 type ListTableHeader struct {
14 Key string `json:"key"` 14 Key string `json:"key"`
1 package adapter 1 package adapter
2 2
3 type ListSupperAssessResp struct { 3 type ListSupperAssessResp struct {
4 - AssessId int `json:"assessId"` //  
5 - CycleId int `json:"cycleId"` //周期id  
6 - BeginDay string `json:"beginDay"` //开始的日期  
7 - UserId int `json:"userId,string"` //用户id  
8 - UserName string `json:"userName"` //用户名称  
9 - EndTime string `json:"endTime"` //截止时间  
10 - InviteTotal int `json:"inviteTota"` //邀请总数  
11 - InviteCompleted int `json:"inviteCompleted"` //邀请未完成  
12 - Status string `json:"status"` //评估任务是否填写完成  
13 - Department string `json:"department"` //部门  
14 - Position string `json:"position"` //职位  
15 - DutyTime string `json:"dutyTime"` //入职时间 4 + StaffAssessTaskId int `json:"staffAssessTaskId"`
  5 + AssessId int `json:"assessId"` //
  6 + CycleId int `json:"cycleId"` //周期id
  7 + BeginDay string `json:"beginDay"` //开始的日期
  8 + UserId int `json:"userId,string"` //用户id
  9 + UserName string `json:"userName"` //用户名称
  10 + EndTime string `json:"endTime"` //截止时间
  11 + InviteTotal int `json:"inviteTota"` //邀请总数
  12 + InviteCompleted int `json:"inviteCompleted"` //邀请未完成
  13 + Status string `json:"status"` //评估任务是否填写完成
  14 + Department string `json:"department"` //部门
  15 + Position string `json:"position"` //职位
  16 + DutyTime string `json:"dutyTime"` //入职时间
16 } 17 }
@@ -1281,9 +1281,9 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU @@ -1281,9 +1281,9 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
1281 {Key: "endTime", Name: "360°评估截止日期"}, 1281 {Key: "endTime", Name: "360°评估截止日期"},
1282 } 1282 }
1283 tableHeader = append(tableHeader, changeableHeader...) 1283 tableHeader = append(tableHeader, changeableHeader...)
1284 - listData := []map[string]string{} 1284 + listData := []map[string]interface{}{}
1285 for _, v := range assessList { 1285 for _, v := range assessList {
1286 - m := map[string]string{ 1286 + m := map[string]interface{}{
1287 "userName": v.TargetUser.UserName, 1287 "userName": v.TargetUser.UserName,
1288 "userId": strconv.Itoa(v.TargetUser.UserId), 1288 "userId": strconv.Itoa(v.TargetUser.UserId),
1289 "status": string(v.Status), 1289 "status": string(v.Status),
@@ -411,17 +411,18 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu @@ -411,17 +411,18 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu
411 {Key: "endTime", Name: "360°评估截止日期"}, 411 {Key: "endTime", Name: "360°评估截止日期"},
412 } 412 }
413 tableHeader = append(tableHeader, changeableHeader...) 413 tableHeader = append(tableHeader, changeableHeader...)
414 - listData := []map[string]string{} 414 + listData := []map[string]interface{}{}
415 for _, v := range assessList { 415 for _, v := range assessList {
416 - m := map[string]string{  
417 - "userName": v.TargetUser.UserName,  
418 - "userId": strconv.Itoa(v.TargetUser.UserId),  
419 - "status": string(v.Status),  
420 - "cycleId": strconv.FormatInt(v.CycleId, 10),  
421 - "beginDay": v.BeginTime.Local().Format("2006-01-02"),  
422 - "types": string(v.Types),  
423 - "endTime": v.EndTime.Local().Format("2006-01-02 15:04:05"),  
424 - "assessId": strconv.Itoa(v.Id), 416 + m := map[string]interface{}{
  417 + "staffAssessTaskId": v.StaffAssessTaskId,
  418 + "userName": v.TargetUser.UserName,
  419 + "userId": strconv.Itoa(v.TargetUser.UserId),
  420 + "status": string(v.Status),
  421 + "cycleId": strconv.FormatInt(v.CycleId, 10),
  422 + "beginDay": v.BeginTime.Local().Format("2006-01-02"),
  423 + "types": string(v.Types),
  424 + "endTime": v.EndTime.Local().Format("2006-01-02 15:04:05"),
  425 + "assessId": strconv.Itoa(v.Id),
425 } 426 }
426 switch v.Status { 427 switch v.Status {
427 case domain.StaffAssessCompleted: 428 case domain.StaffAssessCompleted:
@@ -562,18 +563,19 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu @@ -562,18 +563,19 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu
562 resultList := []adapter.ListSupperAssessResp{} 563 resultList := []adapter.ListSupperAssessResp{}
563 for _, v := range assessList { 564 for _, v := range assessList {
564 item := adapter.ListSupperAssessResp{ 565 item := adapter.ListSupperAssessResp{
565 - AssessId: v.Id,  
566 - CycleId: int(v.CycleId),  
567 - BeginDay: v.BeginTime.Local().Format("2006-01-02"),  
568 - UserId: v.TargetUser.UserId,  
569 - UserName: v.TargetUser.UserName,  
570 - EndTime: v.EndTime.Local().Format("2006-01-02 15:04:05"),  
571 - InviteCompleted: 0,  
572 - Status: string(v.Status),  
573 - InviteTotal: 5,  
574 - Department: "",  
575 - Position: "",  
576 - DutyTime: "", 566 + StaffAssessTaskId: v.StaffAssessTaskId,
  567 + AssessId: v.Id,
  568 + CycleId: int(v.CycleId),
  569 + BeginDay: v.BeginTime.Local().Format("2006-01-02"),
  570 + UserId: v.TargetUser.UserId,
  571 + UserName: v.TargetUser.UserName,
  572 + EndTime: v.EndTime.Local().Format("2006-01-02 15:04:05"),
  573 + InviteCompleted: 0,
  574 + Status: string(v.Status),
  575 + InviteTotal: 5,
  576 + Department: "",
  577 + Position: "",
  578 + DutyTime: "",
577 } 579 }
578 //填入部门 580 //填入部门
579 for _, vv := range v.TargetDepartment { 581 for _, vv := range v.TargetDepartment {