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
9505633b
Commit
9505633b
authored
Jul 07, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审核限制-不是待审核状态
parent
eb8982b2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
9505633b
...
...
@@ -210,7 +210,7 @@ public class TEmployeeContractInfoController {
* @return R
*/
@Operation
(
summary
=
"归档-员工合同(主键:ID;合同编号contractNo;档案柜号fileCabinetNo;附件List<String> attaList)权限temployeecontractinfo_filing"
,
description
=
"归档-员工合同"
)
@SysLog
(
"
审核
员工合同"
)
@SysLog
(
"
归档
员工合同"
)
@PostMapping
(
"/filingContract"
)
@PreAuthorize
(
"@pms.hasPermission('temployeecontractinfo_filing')"
)
public
R
<
String
>
filingContract
(
@RequestBody
TEmployeeContractInfo
tEmployeeContractInfo
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
9505633b
...
...
@@ -402,9 +402,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getId
())
||
Common
.
isEmpty
(
tEmployeeContractInfo
.
getAuditStatus
()))
{
return
R
.
failed
(
"id、意见必填"
);
}
TEmployeeContractInfo
contractInfo
=
this
.
getById
(
tEmployeeContractInfo
.
getId
());
if
(
contractInfo
.
getAuditStatus
()
!=
CommonConstants
.
ONE_INT
)
{
return
R
.
failed
(
"不是待审核状态!"
);
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
2
])
{
TEmployeeContractInfo
contractInfo
=
this
.
getById
(
tEmployeeContractInfo
.
getId
());
// 作废、终止,不变为在用
if
(
Common
.
isEmpty
(
contractInfo
.
getSituation
())
||
(!
CommonConstants
.
dingleDigitStrArray
[
6
].
equals
(
contractInfo
.
getSituation
())
...
...
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