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
b65ae0a7
You need to sign in or sign up before continuing.
Commit
b65ae0a7
authored
Sep 07, 2022
by
查济
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zhaji' into 'develop'
Feature zhaji See merge request fangxinjiang/yifu!242
parents
61ea9f4f
9d64f148
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+7
-7
TInsuranceEkpServiceImpl.java
...nces/service/insurance/impl/TInsuranceEkpServiceImpl.java
+2
-2
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
b65ae0a7
...
...
@@ -3110,7 +3110,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(!
Common
.
isNotEmpty
(
insuranceRefundCheckList
)){
return
R
.
failed
(
"当前导入的减员信息为空"
);
}
if
(
insuranceRefundCheckList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
insuranceRefundCheckList
.
size
()
>
CommonConstants
.
IMPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
Map
<
String
,
List
<
InsuranceRefundCheck
>>
refundMap
=
checkInsuranceRefundList
(
insuranceRefundCheckList
,
user
);
...
...
@@ -3212,7 +3212,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setDeptNoList
(
deptList
);
insuredList
=
this
.
baseMapper
.
getInsuredList
(
param
);
if
(
CollectionUtils
.
isNotEmpty
(
insuredList
)){
if
(
insuredList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
insuredList
.
size
()
>
CommonConstants
.
EXPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
//根据项目编码获取项目名称
...
...
@@ -3287,7 +3287,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setDeptNoList
(
deptNoList
);
List
<
InsuranceRefundListVo
>
insuranceRefundList
=
this
.
baseMapper
.
getInsuranceRefundList
(
param
);
if
(
CollectionUtils
.
isNotEmpty
(
insuranceRefundList
)){
if
(
insuranceRefundList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
insuranceRefundList
.
size
()
>
CommonConstants
.
EXPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
EXPORT_TOO_LONG
);
}
//根据项目编码获取项目名称
...
...
@@ -3369,7 +3369,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
refundExportList
=
baseMapper
.
getRefundExportList
(
param
);
}
if
(
CollectionUtils
.
isNotEmpty
(
refundExportList
)){
if
(
refundExportList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
refundExportList
.
size
()
>
CommonConstants
.
EXPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
EXPORT_TOO_LONG
);
}
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
...
...
@@ -3517,7 +3517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isEmpty
(
insuranceRefundImportList
))
{
return
R
.
failed
(
InsurancesConstants
.
INSURANCE_REFUND_IMPORT_LIST_IS_EMPTY
);
}
if
(
insuranceRefundImportList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
insuranceRefundImportList
.
size
()
>
CommonConstants
.
IMPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
Map
<
String
,
List
<
InsuranceHandleImportParam
>>
map
=
insuranceChangeCheck
(
insuranceRefundImportList
,
user
,
true
);
...
...
@@ -3582,7 +3582,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(!
Common
.
isNotEmpty
(
settleMonthCheckList
))
{
return
R
.
failed
(
InsurancesConstants
.
SETTLE_MONTH_CHANGE_LIST_IS_EMPTY
);
}
if
(
settleMonthCheckList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
settleMonthCheckList
.
size
()
>
CommonConstants
.
IMPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
Map
<
String
,
List
<
SettleMonthChangeCheckParam
>>
map
=
settleMonthChangeCheck
(
settleMonthCheckList
,
user
);
...
...
@@ -3669,7 +3669,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(!
Common
.
isNotEmpty
(
deptChangeCheckList
)){
return
R
.
failed
(
InsurancesConstants
.
OPERATION_LIST_IS_EMPTY
);
}
if
(
deptChangeCheckList
.
size
()
>
CommonConstants
.
TWENTY_THOUSAND
){
if
(
deptChangeCheckList
.
size
()
>
CommonConstants
.
IMPORT_
TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
Map
<
String
,
List
<
DeptChangeCheckParam
>>
stringListMap
=
deptChangeCheck
(
deptChangeCheckList
,
user
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java
View file @
b65ae0a7
...
...
@@ -70,9 +70,9 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
TInsuranceSettle
insuranceSettle
=
tInsuranceSettleService
.
getById
(
tInsuranceEkp
.
getDefaultSettleId
());
boolean
settleIdEquals
=
tInsuranceEkp
.
getDefaultSettleId
().
equals
(
defaultSettleId
);
//预估是否已发送
boolean
estimatePush
=
Common
.
isEmpty
(
insuranceSettle
)
&&
insuranceSettle
.
getIsEstimatePush
()
==
CommonConstants
.
ZERO_INT
;
boolean
estimatePush
=
Common
.
isEmpty
(
insuranceSettle
)
||
insuranceSettle
.
getIsEstimatePush
()
==
CommonConstants
.
ZERO_INT
;
//实缴是否已发送
boolean
actualPush
=
Common
.
isEmpty
(
insuranceSettle
)
&&
insuranceSettle
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
;
boolean
actualPush
=
Common
.
isEmpty
(
insuranceSettle
)
||
insuranceSettle
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
;
//结算类型是否一致
boolean
settleTypeEquals
=
settleType
.
equals
(
byId
.
getSettleType
().
toString
());
EkpInteractiveParam
ekpParam
=
new
EkpInteractiveParam
();
...
...
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