正在显示
4 个修改的文件
包含
8 行增加
和
5 行删除
| @@ -7,7 +7,7 @@ type ListInviteUserAssessResp struct { | @@ -7,7 +7,7 @@ type ListInviteUserAssessResp struct { | ||
| 7 | BeginDay string `json:"beginDay"` | 7 | BeginDay string `json:"beginDay"` |
| 8 | CycleId int `json:"cycleId"` | 8 | CycleId int `json:"cycleId"` |
| 9 | TableHeader []ListTableHeader `json:"tableHeader"` | 9 | TableHeader []ListTableHeader `json:"tableHeader"` |
| 10 | - List []map[string]string `json:"list"` | 10 | + List []map[string]interface{} `json:"list"` |
| 11 | Total int `json:"total"` | 11 | Total int `json:"total"` |
| 12 | } | 12 | } |
| 13 | type ListTableHeader struct { | 13 | type ListTableHeader struct { |
| 1 | package adapter | 1 | package adapter |
| 2 | 2 | ||
| 3 | type ListSupperAssessResp struct { | 3 | type ListSupperAssessResp struct { |
| 4 | + StaffAssessTaskId int `json:"staffAssessTaskId"` | ||
| 4 | AssessId int `json:"assessId"` // | 5 | AssessId int `json:"assessId"` // |
| 5 | CycleId int `json:"cycleId"` //周期id | 6 | CycleId int `json:"cycleId"` //周期id |
| 6 | BeginDay string `json:"beginDay"` //开始的日期 | 7 | BeginDay string `json:"beginDay"` //开始的日期 |
| @@ -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,9 +411,10 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu | @@ -411,9 +411,10 @@ 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{ | 416 | + m := map[string]interface{}{ |
| 417 | + "staffAssessTaskId": v.StaffAssessTaskId, | ||
| 417 | "userName": v.TargetUser.UserName, | 418 | "userName": v.TargetUser.UserName, |
| 418 | "userId": strconv.Itoa(v.TargetUser.UserId), | 419 | "userId": strconv.Itoa(v.TargetUser.UserId), |
| 419 | "status": string(v.Status), | 420 | "status": string(v.Status), |
| @@ -562,6 +563,7 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu | @@ -562,6 +563,7 @@ 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{ |
| 566 | + StaffAssessTaskId: v.StaffAssessTaskId, | ||
| 565 | AssessId: v.Id, | 567 | AssessId: v.Id, |
| 566 | CycleId: int(v.CycleId), | 568 | CycleId: int(v.CycleId), |
| 567 | BeginDay: v.BeginTime.Local().Format("2006-01-02"), | 569 | BeginDay: v.BeginTime.Local().Format("2006-01-02"), |
-
请 注册 或 登录 后发表评论