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
7ea6731b
Commit
7ea6731b
authored
Jul 06, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
cd467bc9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+13
-6
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
7ea6731b
...
...
@@ -1272,13 +1272,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
else
if
(
social
.
getUnitBirthCardinal
().
compareTo
(
socialSet
.
getUpBirth
())
>
CommonConstants
.
ZERO_INT
)
{
social
.
setUnitBirthCardinal
(
socialSet
.
getUpBirth
());
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
social
.
getCollectType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
social
.
getValueType
()))
{
if
(
social
.
getUnitBigailmentCardinal
().
compareTo
(
socialSet
.
getLowerBig
())
<
CommonConstants
.
ZERO_INT
)
{
//按年收取大病方式按定值
social
.
setPersonalBigailmentCardinal
(
socialSet
.
getLowerBig
());
social
.
setUnitBigailmentCardinal
(
socialSet
.
getLowerBig
());
}
else
if
(
social
.
getUnitBigailmentCardinal
().
compareTo
(
socialSet
.
getUpBig
())
>
CommonConstants
.
ZERO_INT
)
{
social
.
setPersonalBigailmentCardinal
(
socialSet
.
getUpBig
());
social
.
setUnitBigailmentCardinal
(
socialSet
.
getUpBig
());
}
}
else
{
social
.
setPersonalBigailmentCardinal
(
BigDecimal
.
ZERO
);
social
.
setUnitBigailmentCardinal
(
BigDecimal
.
ZERO
);
}
}
else
if
(
social
.
getUnitWorkInjuryCardinal
()
!=
null
)
{
// 兼职工伤
if
(
social
.
getUnitWorkInjuryCardinal
().
compareTo
(
socialSet
.
getLowerInjury
())
<
CommonConstants
.
ZERO_INT
)
{
...
...
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