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
41896d80
Commit
41896d80
authored
Jun 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-实缴优化导出
parent
aea6ffa6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
TAutoPaymentDetailServiceImpl.java
...fu/social/service/impl/TAutoPaymentDetailServiceImpl.java
+2
-2
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+17
-2
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAutoPaymentDetailServiceImpl.java
View file @
41896d80
...
...
@@ -278,12 +278,12 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
PARAM_IS_NOT_ERROR
,
excel
));
continue
;
}
if
(
CommonConstants
.
ZERO
_STRING
.
equals
(
paymentInfo
.
getRepeatReviewFlag
())){
if
(
CommonConstants
.
ONE
_STRING
.
equals
(
paymentInfo
.
getRepeatReviewFlag
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"重新复核中,禁止更新!"
,
excel
));
continue
;
}
// 数据合法情况
if
(!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRepeatHandleFlag
())){
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getRepeatHandleFlag
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"'是否重新办理'填写不正确!"
,
excel
));
continue
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
41896d80
...
...
@@ -858,6 +858,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 1险种2参保险种
String
insuranceType
;
// 2参保险种单位
String
insuranceTypeUnit
;
// 2参保险种个人
String
insuranceTypePerson
;
// 单位名称(社保户)
String
socialSecurityAccount
;
// 费款所属期(社保缴纳月份)
...
...
@@ -1030,8 +1034,19 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
detail
.
setPayLimit
(
money
);
}
detail
.
setInsuranceType
(
insuranceType
);
insuranceTypeUnit
=
"单位"
+
insuranceType
;
insuranceTypePerson
=
"个人"
+
insuranceType
;
if
(
"养老保险"
.
equals
(
insuranceType
))
{
insuranceTypeUnit
=
"职工基本养老保险(单位缴纳)"
;
insuranceTypePerson
=
"职工基本养老保险(个人缴纳)"
;
}
else
if
(
"失业保险"
.
equals
(
insuranceType
))
{
insuranceTypeUnit
=
"失业保险(单位缴纳)"
;
insuranceTypePerson
=
"失业保险(个人缴纳)"
;
}
else
if
(
"工伤保险"
.
equals
(
insuranceType
))
{
insuranceTypeUnit
=
"工伤保险"
;
}
if
(
Common
.
isNotNull
(
unitLimit
))
{
detail
.
setInsuranceType
(
"单位"
+
insuranceType
);
detail
.
setInsuranceType
(
insuranceTypeUnit
);
}
detail
.
setSocialSecurityAccount
(
socialSecurityAccount
);
detail
.
setPayMonth
(
payMonth
);
...
...
@@ -1072,7 +1087,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if
(
Common
.
isNotNull
(
paymentBase
))
{
detailPerson
.
setPaymentBase
(
this
.
getBigDecimal
(
paymentBase
));
}
detailPerson
.
setInsuranceType
(
"个人"
+
insuranceType
);
detailPerson
.
setInsuranceType
(
insuranceTypePerson
);
detailPerson
.
setSocialSecurityAccount
(
socialSecurityAccount
);
detailPerson
.
setPayMonth
(
payMonth
);
if
(
Common
.
isNotNull
(
createMonth
))
{
...
...
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