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
da9bc2ad
Commit
da9bc2ad
authored
Apr 22, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
344af6bf
47e08556
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
35 deletions
+37
-35
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+37
-35
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 @
da9bc2ad
...
...
@@ -346,9 +346,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
Map
<
String
,
List
<
InsuranceAddParam
>>
map
=
addInsuranceCheck
(
paramList
,
user
);
//返回给前端的结果
List
<
InsuranceAddParam
>
listResult
=
map
.
get
(
"listResult"
);
...
...
@@ -363,8 +360,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//购买类型,默认为「新增」
detail
.
setOrderNo
(
orderNo
);
detail
.
setBuyType
(
CommonConstants
.
ONE_INT
);
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
if
(
Common
.
isNotNull
(
user
))
{
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
}
//投保状态:待投保
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
detail
.
setPolicyStart
(
LocalDateUtil
.
parseLocalDate
(
success
.
getPolicyStart
()));
...
...
@@ -372,8 +371,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//保费都默认是0
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
detail
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
detail
.
setCreateName
(
null
==
user
?
"自动化派单"
:
user
.
getNickname
());
detailList
.
add
(
detail
);
sourceIdCardList
.
add
(
detail
.
getEmpIdcardNo
());
baseMapper
.
insert
(
detail
);
...
...
@@ -420,9 +419,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
Map
<
String
,
List
<
InsuranceBatchParam
>>
map
=
batchInsuranceCheck
(
paramList
,
user
);
//返回给前端的结果
List
<
InsuranceBatchParam
>
listResult
=
map
.
get
(
"listResult"
);
...
...
@@ -442,12 +438,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
//保费都默认是0
detail
.
setOrderNo
(
orderNo
);
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
if
(
Common
.
isNotNull
(
user
))
{
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
}
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
detail
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
detail
.
setCreateName
(
null
==
user
?
"自动化派单"
:
user
.
getNickname
());
detailList
.
add
(
detail
);
sourceIdCardList
.
add
(
detail
.
getEmpIdcardNo
());
replaceIdList
.
add
(
detail
.
getId
());
...
...
@@ -491,9 +489,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
replaceInsuranceCheck
(
paramList
,
user
);
//返回给前端的结果
List
<
InsuranceReplaceParam
>
listResult
=
map
.
get
(
"listResult"
);
...
...
@@ -553,13 +548,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail
.
setIsUse
(
null
);
newDetail
.
setIsEffect
(
null
);
newDetail
.
setReduceHandleStatus
(
null
);
newDetail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
newDetail
.
setCreateUserDeptName
(
user
.
getDeptName
());
if
(
Common
.
isNotNull
(
user
))
{
newDetail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
newDetail
.
setCreateUserDeptName
(
user
.
getDeptName
());
}
newDetail
.
setSignFlag
(
CommonConstants
.
ZERO_INT
);
//创建时间是新数据插入时间
newDetail
.
setCreateTime
(
LocalDateTime
.
now
());
newDetail
.
setCreateBy
(
user
.
getId
());
newDetail
.
setCreateName
(
user
.
getNickname
());
newDetail
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
newDetail
.
setCreateName
(
null
==
user
?
"自动化派单"
:
user
.
getNickname
());
//替换不参与结算
newDetail
.
setDefaultSettleId
(
null
);
//替换不继承备注 20250331 fxj 替换模板新增备注字段不用清空
...
...
@@ -586,8 +583,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
replace
.
setReplaceStatus
(
CommonConstants
.
ONE_INT
);
replace
.
setReplaceTime
(
LocalDateTime
.
now
());
replace
.
setCreateBy
(
user
.
getId
());
replace
.
setCreateName
(
user
.
getNickname
());
replace
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
replace
.
setCreateName
(
null
==
user
?
"自动化派单"
:
user
.
getNickname
());
replace
.
setCreateTime
(
LocalDateTime
.
now
());
tInsuranceReplaceService
.
save
(
replace
);
updateEmployeeInsurancePre
(
success
.
getInsurancePreId
(),
newDetail
,
CommonConstants
.
THREE_STRING
);
...
...
@@ -2673,7 +2670,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map<String, List<InsuranceAddParam>>}
*/
private
Map
<
String
,
List
<
InsuranceAddParam
>>
addInsuranceCheck
(
List
<
InsuranceAddParam
>
paramList
,
YifuUser
user
){
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
Map
<
String
,
List
<
InsuranceAddParam
>>
map
=
new
HashMap
<>();
List
<
InsuranceAddParam
>
listResult
=
new
ArrayList
<>();
List
<
InsuranceAddParam
>
listSuccess
=
new
ArrayList
<>();
...
...
@@ -3041,7 +3038,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map< String, List< InsuranceBatchParam>>}
*/
private
Map
<
String
,
List
<
InsuranceBatchParam
>>
batchInsuranceCheck
(
List
<
InsuranceBatchParam
>
paramList
,
YifuUser
user
){
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
Map
<
String
,
List
<
InsuranceBatchParam
>>
map
=
new
HashMap
<>();
List
<
InsuranceBatchParam
>
listResult
=
new
ArrayList
<>();
List
<
InsuranceBatchParam
>
listSuccess
=
new
ArrayList
<>();
...
...
@@ -3409,7 +3406,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map< String, List<InsuranceReplaceParam>>}
*/
private
Map
<
String
,
List
<
InsuranceReplaceParam
>>
replaceInsuranceCheck
(
List
<
InsuranceReplaceParam
>
paramList
,
YifuUser
user
){
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
new
HashMap
<>();
List
<
InsuranceReplaceParam
>
listResult
=
new
ArrayList
<>();
List
<
InsuranceReplaceParam
>
listSuccess
=
new
ArrayList
<>();
...
...
@@ -4289,8 +4286,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
operate
.
setDisplayFlag
(
displayFlag
);
operate
.
setInsuranceDetailId
(
detail
.
getId
());
operate
.
setOperateDesc
(
operateDesc
);
operate
.
setCreateBy
(
user
.
getId
());
operate
.
setCreateName
(
user
.
getNickname
());
if
(
Common
.
isNotNull
(
user
))
{
operate
.
setCreateBy
(
user
.
getId
());
operate
.
setCreateName
(
user
.
getNickname
());
}
else
{
operate
.
setCreateBy
(
"1"
);
operate
.
setCreateName
(
"自动化派单"
);
}
operate
.
setCreateTime
(
LocalDateTime
.
now
());
operateList
.
add
(
operate
);
}
...
...
@@ -6070,7 +6072,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R}
*/
public
Map
<
String
,
List
<
InsuranceRefundCheck
>>
checkInsuranceRefundList
(
List
<
InsuranceRefundCheck
>
insuranceRefundCheckList
,
YifuUser
user
){
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
List
<
InsuranceRefundCheck
>
errorList
=
new
ArrayList
<>(
128
);
List
<
InsuranceRefundCheck
>
successList
=
new
ArrayList
<>();
Map
<
String
,
List
<
InsuranceRefundCheck
>>
map
=
new
HashMap
<>();
...
...
@@ -6387,7 +6389,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R}
*/
private
Map
<
String
,
List
<
SettleMonthChangeCheckParam
>>
settleMonthChangeCheck
(
List
<
SettleMonthChangeCheckParam
>
settleMonthCheckList
,
YifuUser
user
)
{
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
Map
<
String
,
List
<
SettleMonthChangeCheckParam
>>
map
=
new
HashMap
<>(
16
);
List
<
SettleMonthChangeCheckParam
>
errorList
=
new
ArrayList
<>();
List
<
SettleMonthChangeCheckParam
>
successList
=
new
ArrayList
<>();
...
...
@@ -6832,7 +6834,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R}
*/
public
Map
<
String
,
List
<
DeptChangeCheckParam
>>
deptChangeCheck
(
List
<
DeptChangeCheckParam
>
deptChangeCheckList
,
YifuUser
user
)
{
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
Map
<
String
,
List
<
DeptChangeCheckParam
>>
map
=
new
HashMap
<>(
16
);
List
<
DeptChangeCheckParam
>
errorList
=
new
ArrayList
<>();
List
<
DeptChangeCheckParam
>
successList
=
new
ArrayList
<>();
...
...
@@ -7163,7 +7165,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public
R
getDeptListByUser
(){
YifuUser
user
=
SecurityUtils
.
getUser
();
//根据当前登录人获取其拥有的项目列表权限
List
<
String
>
deptNoList
=
getDeptNoList
(
user
);
List
<
String
>
deptNoList
=
getDeptNoList
(
null
==
user
?
"1"
:
user
.
getId
()
);
List
<
Dept
>
deptList
=
new
ArrayList
<>(
16
);
if
(
CollectionUtils
.
isNotEmpty
(
deptNoList
)){
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
deptNoList
);
...
...
@@ -7368,13 +7370,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 获取项目权限
*
* @author zhaji
* @param user
* @param user
Id
* @return {@link List< String>}
*/
public
List
<
String
>
getDeptNoList
(
YifuUser
user
){
public
List
<
String
>
getDeptNoList
(
String
userId
){
List
<
String
>
deptList
=
new
ArrayList
<>(
16
);
try
{
R
<
TSettleDomainListVo
>
settleDomainList
=
archivesDaprUtil
.
getSettleDomainIdsByUserId
(
user
.
getId
()
);
R
<
TSettleDomainListVo
>
settleDomainList
=
archivesDaprUtil
.
getSettleDomainIdsByUserId
(
user
Id
);
if
(
Common
.
isNotNull
(
settleDomainList
)
&&
settleDomainList
.
getCode
()
==
CommonConstants
.
SUCCESS
){
TSettleDomainListVo
data
=
settleDomainList
.
getData
();
if
(
Optional
.
ofNullable
(
data
).
isPresent
()){
...
...
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