|
...
|
...
|
@@ -656,7 +656,7 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDayV2(param *query.List |
|
|
|
changeableRows[v.TargetUserId]["assessId"] = v.AssessId
|
|
|
|
changeableRows[v.TargetUserId]["cycleId"] = v.CycleId
|
|
|
|
changeableRows[v.TargetUserId]["beginDay"] = v.BeginDay
|
|
|
|
if v.ContentId > 0 {
|
|
|
|
// if v.ContentId > 0 {
|
|
|
|
name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
|
|
|
|
key := fmt.Sprintf("k%d", i)
|
|
|
|
if _, ok := headerMap[name]; !ok {
|
|
...
|
...
|
@@ -667,7 +667,7 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDayV2(param *query.List |
|
|
|
}
|
|
|
|
key = headerMap[name]
|
|
|
|
changeableRows[v.TargetUserId][key] = v.Value
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
list := []map[string]interface{}{}
|
|
|
|
for _, v := range tableSort {
|
...
|
...
|
|
