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
ebb70242
Commit
ebb70242
authored
Dec 14, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check服务优化
parent
b0374a4a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+13
-5
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
ebb70242
...
...
@@ -1219,10 +1219,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TEmployeeProject
tEmployeeProject
;
TEmployeeInfo
tEmployeeInfo
;
int
i
=
1
;
int
errorCount
=
0
;
for
(
TEmployeeContractInfo
contract:
contractInfos
){
i
++;
if
(
contract
.
getAuditStatus
()
!=
CommonConstants
.
ONE_INT
)
{
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"不是待审核状态!"
,
CommonConstants
.
RED
));
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"不是待审核状态!"
,
CommonConstants
.
RED
,
contract
.
getApplyNo
()));
errorCount
++;
continue
;
}
tEmployeeContractInfo
=
new
TEmployeeContractInfo
();
...
...
@@ -1263,18 +1265,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TEmployeeContractInfo
old
=
this
.
getById
(
contract
.
getOldContractId
());
if
(
old
!=
null
&&
Common
.
isNotNull
(
old
.
getId
()))
{
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
old
.
getInUse
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"关联的原合同已不在用!"
,
CommonConstants
.
RED
));
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"关联的原合同已不在用!"
,
CommonConstants
.
RED
,
contract
.
getApplyNo
()));
errorCount
++;
continue
;
}
else
{
old
.
setInUse
(
CommonConstants
.
ONE_STRING
);
this
.
updateById
(
old
);
}
}
else
{
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"未找到关联的原合同!"
,
CommonConstants
.
RED
));
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"未找到关联的原合同!"
,
CommonConstants
.
RED
,
contract
.
getApplyNo
()));
errorCount
++;
continue
;
}
}
else
{
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"未找到关联的原合同!"
,
CommonConstants
.
RED
));
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"未找到关联的原合同!"
,
CommonConstants
.
RED
,
contract
.
getApplyNo
()));
errorCount
++;
continue
;
}
...
...
@@ -1314,7 +1319,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 不是待提交,记录审核记录
this
.
setAuditInfo
(
tEmployeeContractInfo
);
this
.
updateById
(
tEmployeeContractInfo
);
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"更新成功!"
,
CommonConstants
.
GREEN
));
errorMessages
.
add
(
new
ErrorMessage
(
i
,
"审核成功!"
,
CommonConstants
.
GREEN
));
}
if
(
errorCount
==
CommonConstants
.
ZERO_INT
){
return
R
.
ok
();
}
return
R
.
ok
(
errorMessages
);
}
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
ebb70242
...
...
@@ -97,7 +97,7 @@ archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\
archives.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
8FDB
\u
884C
\u
4E2D/
\u
672A
\u
5B8C
\u
7ED3
\u7684\u
670D
\u
52A1
archives.project.change.contract.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
5
B58
\u5728\u5
728\u7528\u6216\u
5F85
\u
5BA1
\u6838\u3001\u
5F85
\u
63D0
\u
4EA4
\u7684\u5408\u
540C
\u
FF0C
\u
4E0D
\u5141\u
8BB8
\u
51CF
\u9879
archives.project.change.contract.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u5728\u7528\u6216\u
5F85
\u
5BA1
\u6838\u3001\u
5F85
\u
63D0
\u
4EA4
\u7684\u5408\u
540C
\u
FF0C
\u
4E0D
\u5141\u
8BB8
\u
51CF
\u9879
archives.project.emp.lose.fee.not.empty
=
\u
4E0D
\u
826F
\u
8BB0
\u
5F55
\u
8D39
\u7528\u
635F
\u5931\u
548C
\u5176\u
4ED6
\u
635F
\u5931\u
4E0D
\u
53EF
\u
540C
\u
65F6
\u
4E3A
\u
7A7A
...
...
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