切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
90db6aa4d772166c7f5ad9561c75a9b2fdfc7329
1 个父辈
59404d40
调整导出的数据
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
14 行增加
和
8 行删除
pkg/application/staff_assess/service/service_3.go
pkg/infrastructure/dao/staff_assess_dao.go
pkg/application/staff_assess/service/service_3.go
查看文件 @
90db6aa
...
...
@@ -554,7 +554,7 @@ func (srv StaffAssessServeice) ExportUserAssess2(param *query.ExportUserAssess2C
"transactionContext"
:
transactionContext
,
})
// 获取所有的评估项
categoryNameList
,
err
:=
assessDao
.
SearchContentCategoryName
(
param
.
CompanyId
,
param
.
CycleId
,
param
.
OperatorId
,
hrbp
)
categoryNameList
,
err
:=
assessDao
.
SearchContentCategoryName
(
param
.
CompanyId
,
param
.
CycleId
,
param
.
OperatorId
,
hrbp
,
param
.
ExportUserId
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
...
...
@@ -769,7 +769,6 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ExportAssessContent
xlsxFile
.
SetCellStr
(
sheetName
,
"B2"
,
"姓名"
)
xlsxFile
.
MergeCell
(
sheetName
,
"B2"
,
"B4"
)
xlsxFile
.
SetCellStr
(
sheetName
,
"A5"
,
"评估标准"
)
//行数量
rowNum
:=
0
for
_
,
v
:=
range
eData
.
rowSort
.
Child
{
...
...
@@ -839,6 +838,7 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ExportAssessContent
}
}
}
xlsxFile
.
MergeCell
(
sheetName
,
"A1"
,
fmt
.
Sprintf
(
"A%d"
,
colNum
))
colName
,
_
:=
excelize
.
ColumnNumberToName
(
colNum
+
2
)
xlsxFile
.
MergeCell
(
sheetName
,
"A1"
,
colName
+
"1"
)
return
xlsxFile
,
nil
}
...
...
pkg/infrastructure/dao/staff_assess_dao.go
查看文件 @
90db6aa
...
...
@@ -1108,7 +1108,7 @@ type ContentCategoryName struct {
// 员工绩效-综合管理-导出绩效指标
// 抽取出评估的指标
func
(
d
*
StaffAssessDao
)
SearchContentCategoryName
(
companyId
int
,
cycleId
int
,
userId
int
,
hrbp
int
)
([]
ContentCategoryName
,
error
)
{
func
(
d
*
StaffAssessDao
)
SearchContentCategoryName
(
companyId
int
,
cycleId
int
,
userId
int
,
hrbp
int
,
exportUserIds
[]
string
)
([]
ContentCategoryName
,
error
)
{
sqlStr
:=
`
select
staff_assess_content.category,
...
...
@@ -1126,19 +1126,25 @@ func (d *StaffAssessDao) SearchContentCategoryName(companyId int, cycleId int, u
END) as cnt
from staff_assess_content
join t_staff_assess_1 on staff_assess_content.staff_assess_id = t_staff_assess_1.assess_id
group by staff_assess_content.category,
where 1=1
`
condition
:=
[]
interface
{}{}
if
len
(
exportUserIds
)
>
0
{
condition
=
append
(
condition
,
pg
.
In
(
exportUserIds
))
sqlStr
+=
` and t_staff_assess_1.target_user_id in(?) `
}
sqlStr
+=
` group by staff_assess_content.category,
staff_assess_content."name" ,
t_staff_assess_1.cycle_id ,
t_staff_assess_1.cycle_name,
staff_assess_content.weight ,
target_user_id,target_user_name
order by cnt desc,target_user_id
`
order by cnt desc,target_user_id `
sqlStr0
:=
d
.
useTStaffAssess
(
companyId
,
cycleId
,
userId
,
""
,
hrbp
,
5000
,
0
,
string
(
domain
.
AssessSelf
))
sqlStr
=
sqlStr0
+
sqlStr
tx
:=
d
.
transactionContext
.
PgTx
result
:=
[]
ContentCategoryName
{}
_
,
err
:=
tx
.
Query
(
&
result
,
sqlStr
)
_
,
err
:=
tx
.
Query
(
&
result
,
sqlStr
,
condition
...
)
return
result
,
err
}
...
...
请
注册
或
登录
后发表评论