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
3de8079f
Commit
3de8079f
authored
Jul 20, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同优化-删除的提示语
parent
e052cc84
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
15 deletions
+5
-15
EmployeeContractConstants.java
...v1/yifu/archives/constants/EmployeeContractConstants.java
+3
-13
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeContractConstants.java
View file @
3de8079f
...
...
@@ -2,20 +2,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.constants;
public
class
EmployeeContractConstants
{
public
static
final
String
NO_INFO
=
"未找到记录"
;
public
static
final
String
NO_INFO
=
"未找到记录"
;
public
static
final
String
NOT_CREATE_USER
=
"不是创建人,无法删除"
;
public
static
final
String
NOT_CREATE_USER
=
"不是创建人,无法删除"
;
public
static
final
String
NOT_AUDIT_STATUS
=
"不是待审核
或审核不通过,无法删除"
;
public
static
final
String
NOT_AUDIT_STATUS
=
"不是待提交
或审核不通过,无法删除"
;
public
static
final
String
searchEmpContractInfo
=
" 查询对应的员工合同信息!"
;
public
static
final
String
sameEmpOnlyOneStandContract
=
"同一员工只允许一个在用标准合同,请按员工编码:"
;
public
static
final
String
exportTip
=
"数据导入解析!数据行数:"
;
public
final
static
String
ContractUpdateFailInfo
=
"合同更新失败:合同更新同步更新派单数据更新失败!"
;
public
final
static
String
UTF8
=
"UTF-8"
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
3de8079f
...
...
@@ -445,11 +445,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
return
R
.
failed
(
"未找到记录"
);
}
else
{
if
(!
user
.
getId
().
equals
(
contractInfo
.
getCreateBy
()))
{
return
R
.
failed
(
"不是合同创建人,无法删除"
);
return
R
.
failed
(
EmployeeContractConstants
.
NOT_CREATE_USER
);
}
if
(
contractInfo
.
getAuditStatus
()
!=
CommonConstants
.
ZERO_INT
&&
contractInfo
.
getAuditStatus
()
!=
CommonConstants
.
dingleDigitIntArray
[
3
])
{
return
R
.
failed
(
"不是待提交或审核不通过,无法删除"
);
return
R
.
failed
(
EmployeeContractConstants
.
NOT_AUDIT_STATUS
);
}
contractInfo
.
setDeleteFlag
(
CommonConstants
.
ONE_INT
);
this
.
updateById
(
contractInfo
);
...
...
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