作者 tangxvhui

修复 excel数据导出错误

... ... @@ -823,7 +823,7 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ExportAssessContent
for _, v4 := range eData.rowSort.Child {
//纵向-索引-第一列-日期
if len(includeBeginDay) > 0 {
if _, ok := includeBeginDay[v.Name]; !ok {
if _, ok := includeBeginDay[v4.Name]; !ok {
continue
}
}
... ...
... ... @@ -1025,7 +1025,7 @@ func (d *StaffAssessDao) ExportDataUserAssess(param SearchConditin1) ([]ExportDa
condition = append(condition, pg.In(param.TargetUserId))
}
//加入排序
sqlStr += ` order by convert_to(t_staff_assess_1.target_user_name,'GBK'),staff_assess_content.sort_by `
sqlStr += ` order by convert_to(t_staff_assess_1.target_user_name,'GBK'),t_staff_assess_1.begin_day,staff_assess_content.sort_by `
//获取前置sql语句
sqlStr0 := d.useTStaffAssess(param.CompanyId, param.CycleId, param.OperaterId, param.BeginDay, param.Hrbp, param.Limit, param.Offset, string(domain.AssessSelf))
sqlStr = sqlStr0 + sqlStr
... ...