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
9f11d6ac
Commit
9f11d6ac
authored
Oct 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
e345cee3
08f1dec6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
2 deletions
+19
-2
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+19
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
9f11d6ac
...
...
@@ -1371,9 +1371,26 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
try
{
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
rel
.
getPaymentType
())){
if
(
BigDecimal
.
valueOf
(
Double
.
valueOf
(
rel
.
getRecordBase
())).
compareTo
(
setInfo
.
getLowerLimit
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerLimit
());
BigDecimal
recordBaseDecimal
=
new
BigDecimal
(
rel
.
getRecordBase
());
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
setInfo
.
getIsSameBase
())){
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerLimit
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerLimit
());
}
}
else
{
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerPersion
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerPersion
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerMedical
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerMedical
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerBirth
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerBirth
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerInjury
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerInjury
());
}
else
if
(
recordBaseDecimal
.
compareTo
(
setInfo
.
getLowerUnemployment
())
>
0
)
{
return
R
.
failed
(
"备案基数不大于配置名称("
+
rel
.
getConfigName
()+
")最低基数:"
+
setInfo
.
getLowerUnemployment
());
}
}
}
}
catch
(
NumberFormatException
e
)
{
return
R
.
failed
(
"备案基数格式不正确"
);
...
...
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