Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
58a618f0
You need to sign in or sign up before continuing.
Commit
58a618f0
authored
Dec 21, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同审核导出 和 派单审核导出问题
parent
da9f6a30
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+4
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
58a618f0
...
@@ -373,10 +373,13 @@ public class TEmployeeContractInfoController {
...
@@ -373,10 +373,13 @@ public class TEmployeeContractInfoController {
@SysLog
(
"批量导出合同审核"
)
@SysLog
(
"批量导出合同审核"
)
@PostMapping
(
"/exportAuditContractInfo"
)
@PostMapping
(
"/exportAuditContractInfo"
)
@PreAuthorize
(
"@pms.hasPermission('employee_export_contract_audit')"
)
@PreAuthorize
(
"@pms.hasPermission('employee_export_contract_audit')"
)
public
void
exportAuditContractInfo
(
@RequestBody
(
required
=
false
)
TEmployeeContractSearchVo
contractInfo
,
HttpServletResponse
response
)
{
public
void
exportAuditContractInfo
(
@RequestBody
(
required
=
false
)
TEmployeeContractSearchVo
contractInfo
,
@RequestParam
(
required
=
false
,
name
=
"mId"
)
String
mId
,
HttpServletResponse
response
)
{
if
(
Common
.
isEmpty
(
contractInfo
)){
if
(
Common
.
isEmpty
(
contractInfo
)){
contractInfo
=
new
TEmployeeContractSearchVo
();
contractInfo
=
new
TEmployeeContractSearchVo
();
}
}
contractInfo
.
setMId
(
mId
);
contractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
contractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
this
.
setAuth
(
contractInfo
);
this
.
setAuth
(
contractInfo
);
tEmployeeContractInfoService
.
exportAuditContractInfo
(
contractInfo
,
response
);
tEmployeeContractInfoService
.
exportAuditContractInfo
(
contractInfo
,
response
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
58a618f0
...
@@ -344,9 +344,11 @@ public class TDispatchInfoController {
...
@@ -344,9 +344,11 @@ public class TDispatchInfoController {
@Operation
(
description
=
"导出派单审核记录 hasPermission('tdispatchinfo-export')"
)
@Operation
(
description
=
"导出派单审核记录 hasPermission('tdispatchinfo-export')"
)
@PostMapping
(
"/auditExport"
)
@PostMapping
(
"/auditExport"
)
@PreAuthorize
(
"@pms.hasPermission('tdispatchinfo-export')"
)
@PreAuthorize
(
"@pms.hasPermission('tdispatchinfo-export')"
)
public
void
auditExport
(
HttpServletResponse
response
,
@RequestBody
TDispatchInfoSearchVo
searchVo
)
{
public
void
auditExport
(
HttpServletResponse
response
,
@RequestBody
TDispatchInfoSearchVo
searchVo
,
@RequestParam
(
required
=
false
,
name
=
"mId"
)
String
mId
)
{
searchVo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
searchVo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
searchVo
.
setStatus
(
CommonConstants
.
ONE_STRING
);
searchVo
.
setStatus
(
CommonConstants
.
ONE_STRING
);
searchVo
.
setMId
(
mId
);
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
menuUtil
.
setAuthSql
(
user
,
searchVo
);
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
...
...
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