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
59a0d47e
Commit
59a0d47e
authored
Dec 23, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
7c501f91
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+1
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-1
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+4
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
59a0d47e
...
...
@@ -201,7 +201,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
));
if
(
Common
.
isNotNull
(
tEmployeeProject
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
CHECKS_CHANGE_EMP_PROJEC
T
,
excel
.
getNewSettleCode
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_NEW_SEARCH_NOT_EXIS
T
,
excel
.
getNewSettleCode
()));
}
// 数据合法情况
if
(
CollUtil
.
isEmpty
(
errorMsg
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
59a0d47e
...
...
@@ -600,7 +600,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
errorTemp
.
append
(
"合同可用或在途、"
);
}
if
(
Common
.
isNotNull
(
errorTemp
)){
if
(
Common
.
isNotNull
(
errorTemp
.
toString
()
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
));
break
;
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
59a0d47e
...
...
@@ -307,6 +307,10 @@ public interface ErrorCodes {
* 人员在原项目中存在在途的服务,请先终止后,再进行划转
*/
String
QT_PROJECT_CHANGE_NOT_EXIST
=
"qt.project.change.not.exist"
;
/**
* 未找到对应的新项目或者新项目已停止合作,请核实
*/
String
PROJECT_NEW_SEARCH_NOT_EXIST
=
"project.new.search.not.exist"
;
/**
* 未找到对应的项目或者项目已停止合作,请核实
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
59a0d47e
...
...
@@ -102,7 +102,8 @@ archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0
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
qt.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
539F
\u9879\u
76EE
\u
4E2D
\u
5B58
\u5728\u5728\u9014\u7684\u
670D
\u
52A1
\u
FF0C
\u
8BF7
\u5148\u
7EC8
\u
6B62
\u
540E
\u
FF0C
\u
518D
\u
8FDB
\u
884C
\u5212\u
8F6C
project.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u
65B0
\u9879\u
76EE
\u6216\u8005\u
65B0
\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
project.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u9879\u
76EE
\u6216\u8005\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
project.new.search.not.exist
=
\u
672A
\u
627E
\u5230\u
5BF9
\u
5E94
\u7684\u
65B0
\u9879\u
76EE
\u6216\u8005\u
65B0
\u9879\u
76EE
\u
5DF2
\u
505C
\u
6B62
\u5408\u
4F5C
\u
FF0C
\u
8BF7
\u6838\u
5B9E
change.strat.month.exit
=
\u5212\u
8F6C
\u
8D77
\u
59CB
\u6708\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
change.less.month.exit
=
\u5212\u
8F6C
\u
8D77
\u
59CB
\u6708\u8981\u
5C0F
\u
4E8E
\u
7B49
\u
4E8E
\u
5F53
\u
524D
\u6708
...
...
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