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
15d6e033
You need to sign in or sign up before continuing.
Commit
15d6e033
authored
Feb 06, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
6f2b15dc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
5 deletions
+36
-5
InsuranceHandleImportParam.java
...lus/v1/yifu/insurances/vo/InsuranceHandleImportParam.java
+6
-0
InsuranceInsuredParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceInsuredParam.java
+6
-0
InsuranceRegisterInvoiceNoParam.java
...1/yifu/insurances/vo/InsuranceRegisterInvoiceNoParam.java
+5
-0
InsuranceRegisterParam.java
...ud/plus/v1/yifu/insurances/vo/InsuranceRegisterParam.java
+6
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+5
-5
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceHandleImportParam.java
View file @
15d6e033
...
...
@@ -78,4 +78,10 @@ public class InsuranceHandleImportParam implements Serializable {
*/
@Schema
(
description
=
"错误信息"
)
private
String
errorMessage
;
/**
* 错误标志 0 正确 1错误
*/
@Schema
(
description
=
"错误标志"
)
private
String
flag
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceInsuredParam.java
View file @
15d6e033
...
...
@@ -94,6 +94,12 @@ public class InsuranceInsuredParam implements Serializable {
@Schema
(
description
=
"错误信息"
)
private
String
errorMessage
;
/**
* 错误标志 0 正确 1错误
*/
@Schema
(
description
=
"错误标志"
)
private
String
flag
;
/**
* 数据传递对象
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterInvoiceNoParam.java
View file @
15d6e033
...
...
@@ -64,6 +64,11 @@ public class InsuranceRegisterInvoiceNoParam implements Serializable {
@Schema
(
description
=
"发票号"
)
private
String
invoiceNo
;
/**
* 错误标志 0 正确 1错误
*/
@Schema
(
description
=
"错误标志"
)
private
String
flag
;
/**
* 错误信息
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterParam.java
View file @
15d6e033
...
...
@@ -83,6 +83,12 @@ public class InsuranceRegisterParam implements Serializable {
@Schema
(
description
=
"错误信息"
)
private
String
errorMessage
;
/**
* 错误标志 0 正确 1错误
*/
@Schema
(
description
=
"错误标志"
)
private
String
flag
;
/**
* 数据传递对象
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
15d6e033
...
...
@@ -3387,6 +3387,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
outer:
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
InsuranceRegisterParam
param
=
distinctList
.
get
(
i
);
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
// 必填校验
if
(
StringUtils
.
isBlank
(
param
.
getEmpName
())){
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_NAME_NOT_EMPTY
);
...
...
@@ -3635,6 +3636,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
param
.
setErrorMessage
(
CommonConstants
.
RESULT_DATA_SUCESS
);
param
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
//所有校验通过后设置查到的结果
param
.
setDetail
(
detail
);
}
...
...
@@ -3652,6 +3654,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
private
List
<
InsuranceRegisterInvoiceNoParam
>
registeredInvoiceNoCheck
(
List
<
InsuranceRegisterInvoiceNoParam
>
paramList
,
List
<
TInsuranceAreaRes
>
insuranceAreaResList
){
List
<
InsuranceRegisterInvoiceNoParam
>
collect
=
paramList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
for
(
InsuranceRegisterInvoiceNoParam
param
:
collect
)
{
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
// 必填校验
if
(
StringUtils
.
isBlank
(
param
.
getEmpName
())){
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_NAME_NOT_EMPTY
);
...
...
@@ -3730,6 +3733,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
param
.
setErrorMessage
(
CommonConstants
.
RESULT_DATA_SUCESS
);
param
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
//所有校验通过后设置查到的结果
param
.
setDetail
(
detail
);
}
...
...
@@ -3749,6 +3753,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
private
List
<
InsuranceInsuredParam
>
updateInsuranceInsuredCheck
(
List
<
InsuranceInsuredParam
>
paramList
,
List
<
TInsuranceAreaRes
>
insuranceAreaResList
){
List
<
InsuranceInsuredParam
>
collect
=
paramList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
for
(
InsuranceInsuredParam
param
:
collect
)
{
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
// 必填校验
if
(
StringUtils
.
isBlank
(
param
.
getEmpName
())){
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_NAME_NOT_EMPTY
);
...
...
@@ -3869,6 +3874,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
param
.
setErrorMessage
(
CommonConstants
.
RESULT_DATA_SUCESS
);
param
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
//所有校验通过后设置查到的结果
param
.
setDetail
(
detail
);
}
...
...
@@ -6124,6 +6130,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
InsuranceHandleImportParam
param
=
distinctList
.
get
(
i
);
//办理结果
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
String
handType
=
param
.
getHandType
();
if
(
StringUtils
.
isBlank
(
handType
)){
param
.
setErrorMessage
(
InsurancesConstants
.
HAND_RESULT_IS_EMPTY
);
...
...
@@ -6289,6 +6296,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
param
.
setId
(
detailId
);
param
.
setErrorMessage
(
CommonConstants
.
RESULT_DATA_SUCESS
);
param
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
}
return
distinctList
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
15d6e033
...
...
@@ -2238,7 +2238,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
pensionMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
())),
pensionMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
SocialConstants
.
ERROR_TEMPLATE
+
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的养老缴费数据"
));
continue
;
}
else
{
...
...
@@ -2275,7 +2275,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
unEmpMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
())),
unEmpMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
SocialConstants
.
ERROR_TEMPLATE
+
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的失业缴费数据"
));
continue
;
}
else
{
...
...
@@ -2313,7 +2313,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
medicalMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMedicalMoney
())),
medicalMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
SocialConstants
.
ERROR_TEMPLATE
+
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医保缴费数据"
));
continue
;
}
else
{
...
...
@@ -2353,7 +2353,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
())),
injuryMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
SocialConstants
.
ERROR_TEMPLATE
+
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的工伤缴费数据"
));
continue
;
}
else
{
...
...
@@ -2392,7 +2392,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBigailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalBigailmentMoney
())),
bigMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
SocialConstants
.
ERROR_TEMPLATE
+
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
""
,
""
,
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医疗救助金缴费数据"
));
continue
;
}
else
{
...
...
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