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
bbb54dc1
Commit
bbb54dc1
authored
Jul 06, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
e0a26b40
5ddb84ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+1
-5
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
bbb54dc1
...
...
@@ -1391,8 +1391,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//收取方式按年 且为指定月份时产生数据
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
social
.
getCollectType
())
&&
Common
.
isNotNull
(
socialSet
))
{
//按年收取大病方式按定值
social
.
setPersonalBigailmentCardinal
(
BigDecimal
.
ZERO
);
social
.
setUnitBigailmentCardinal
(
BigDecimal
.
ZERO
);
social
.
setUnitBigailmentMoney
(
socialSet
.
getPayCompany
());
social
.
setPersonalBigailmentMoney
(
socialSet
.
getPayPersonal
());
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
social
.
getCollectType
()))
{
...
...
@@ -1403,8 +1401,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
social
.
setPersonalBigailmentMoney
(
BigDecimalUtils
.
safeMultiply
(
social
.
getPersonalBigailmentCardinal
(),
social
.
getPersonalBigailmentPer
(),
BigDecimal
.
valueOf
(
CommonConstants
.
ONE_OF_PERCENT
.
doubleValue
())));
}
else
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
social
.
getValueType
())
&&
Common
.
isNotNull
(
socialSet
))
{
//收取大病方式按定值
social
.
setPersonalBigailmentCardinal
(
BigDecimal
.
ZERO
);
social
.
setUnitBigailmentCardinal
(
BigDecimal
.
ZERO
);
social
.
setUnitBigailmentMoney
(
socialSet
.
getPayCompany
());
social
.
setPersonalBigailmentMoney
(
socialSet
.
getPayPersonal
());
}
...
...
@@ -1467,7 +1463,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 2022-8-9 15:26:20 新增逻辑:从不收取变为收取
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
sysBaseSetInfo
.
getIsIllness
())
&&
socialFundInfo
.
getBigailmentStart
()
==
null
&&
Common
.
isNotNull
(
socialFundInfo
.
getUnitPensionCardinal
()))
{
startDate
=
DateUtil
.
stringToDate
(
sysBaseSetInfo
.
getDoMonth
()
,
"yyyyMM
"
);
startDate
=
DateUtil
.
stringToDate
(
sysBaseSetInfo
.
getDoMonth
()
+
"01"
,
"yyyyMMdd
"
);
socialFundInfo
.
setBigailmentHandle
(
CommonConstants
.
ONE_STRING
);
socialFundInfo
.
setBigailmentStart
(
startDate
);
}
...
...
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