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
ab597f07
Commit
ab597f07
authored
May 22, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目配置限制项优化-fxj
parent
0fea4a75
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
4 deletions
+38
-4
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+38
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
ab597f07
...
...
@@ -2222,7 +2222,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
if
(
Common
.
isEmpty
(
entity
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"项目编码不存在: "
+
excel
.
getDeptNo
(),
excel
));
"项目编码
配置
不存在: "
+
excel
.
getDeptNo
(),
excel
));
return
;
}
//档案默认不限制
...
...
@@ -2237,21 +2237,55 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
String
newRestrictContract
=
excel
.
getRestrictContract
();
String
newRestrictSocialFund
=
excel
.
getRestrictSocialFund
();
// 校验autoFlag的值必须为0或1
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newAutoFlag
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制值不合法,必须为限制或不限制"
,
excel
));
return
;
}
// 校验restrictInsurance的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictInsurance
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictInsurance
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictInsurance
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"商险限制值不合法,必须为限制或不限制"
,
excel
));
return
;
}
// 校验restrictContract的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictContract
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictContract
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictContract
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"合同限制值不合法,必须为限制或不限制"
,
excel
));
return
;
}
// 校验restrictSocialFund的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictSocialFund
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictSocialFund
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictSocialFund
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"社保公积金限制值不合法,必须为限制或不限制"
,
excel
));
return
;
}
// 业务规则:如果是否限制为"是"(0),各限制分项不能为空,且至少有一项为限制(1)
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
))
{
if
(
Common
.
isEmpty
(
newRestrictInsurance
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,
限制
商险不能为空"
,
excel
));
"是否限制为是时,商险不能为空"
,
excel
));
return
;
}
if
(
Common
.
isEmpty
(
newRestrictContract
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,
限制
合同不能为空"
,
excel
));
"是否限制为是时,合同不能为空"
,
excel
));
return
;
}
if
(
Common
.
isEmpty
(
newRestrictSocialFund
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制为是时,
限制
社保公积金不能为空"
,
excel
));
"是否限制为是时,社保公积金不能为空"
,
excel
));
return
;
}
// 限制项至少有一项为限制(1)
...
...
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