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
43e88fd2
Commit
43e88fd2
authored
Nov 07, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
22fb384a
e875c75d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-2
TSocialfundHouseResServiceImpl.java
...u/social/service/impl/TSocialfundHouseResServiceImpl.java
+5
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
43e88fd2
...
@@ -1793,8 +1793,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1793,8 +1793,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
//存在社保缴费数据
if
(
null
!=
payExists
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
if
(
null
!=
payExists
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
get
UnitMedic
alMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
get
Person
alMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
get
PersonalMedical
Money
())),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
get
Unit
Money
())),
BigDecimalUtils
.
isNullToZero
(
payExists
.
getUnitInjuryMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
BigDecimalUtils
.
isNullToZero
(
payExists
.
getUnitInjuryMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的单位工伤缴费数据,请勿重复导入!"
));
+
"的单位工伤缴费数据,请勿重复导入!"
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java
View file @
43e88fd2
...
@@ -56,6 +56,11 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -56,6 +56,11 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
*/
*/
@Override
@Override
public
List
<
TSocialfundHouseRes
>
getexportList
(
TSocialfundHouseRes
searchVo
)
{
public
List
<
TSocialfundHouseRes
>
getexportList
(
TSocialfundHouseRes
searchVo
)
{
if
(!
Common
.
isNotNull
(
searchVo
.
getHouseNameType
()))
{
searchVo
.
setAuthType
(
CommonConstants
.
ZERO_STRING
);
}
else
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
searchVo
.
getHouseNameType
())){
searchVo
.
setAuthType
(
CommonConstants
.
ONE_STRING
);
}
return
baseMapper
.
getexportList
(
searchVo
);
return
baseMapper
.
getexportList
(
searchVo
);
}
}
...
...
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