Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
76c8e778
Commit
76c8e778
authored
Oct 29, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.0' into MVP1.7.0
parents
7552d20c
87c22814
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
TCompleteMonitorController.java
.../yifu/archives/controller/TCompleteMonitorController.java
+1
-0
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCompleteMonitorController.java
View file @
76c8e778
...
...
@@ -46,6 +46,7 @@ public class TCompleteMonitorController {
**/
@Operation
(
description
=
"导出档案完整度监控管理-全量 权限:archves_tcompletemonitor_export_all"
)
@PostMapping
(
"/exportAll"
)
@SysLog
(
"导出档案完整度监控管理-全量"
)
//@PreAuthorize("@pms.hasPermission('archves_tcompletemonitor_export_all')")
public
void
exportAll
(
HttpServletResponse
response
,
@RequestBody
TCompleteMonitorSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
76c8e778
...
...
@@ -203,6 +203,7 @@ public class TSalaryAccountController {
**/
@Operation
(
description
=
"导出工资报账主表(工资条) hasPermission('salary_tsalaryaccount-export')"
)
@PostMapping
(
"/export"
)
@SysLog
(
"员工报账查询-批量导出"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tsalaryaccount-export')"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TSalaryAccountSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
...
...
@@ -220,6 +221,7 @@ public class TSalaryAccountController {
**/
@Operation
(
description
=
"审核人导出 hasPermission('account_audit_export')"
)
@PostMapping
(
"/auditExport"
)
@SysLog
(
"员工报账查询-审核人导出"
)
@PreAuthorize
(
"@pms.hasPermission('account_audit_export')"
)
public
void
auditExport
(
HttpServletResponse
response
,
@RequestBody
TSalaryAccountSearchVo
searchVo
)
{
tSalaryAccountService
.
exportAsso
(
response
,
searchVo
,
CommonConstants
.
ONE_INT
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment