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
3da53131
Commit
3da53131
authored
Apr 01, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
3190ded1
a0ef436b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
20 deletions
+34
-20
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+25
-8
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+9
-12
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
3da53131
...
...
@@ -2782,7 +2782,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//获取项目信息
R
<
TSettleDomainSelectVo
>
domainR
=
archivesDaprUtil
.
getSettleDomainSelectVoById
(
excel
.
getDeptNo
());
if
(
null
==
domainR
||
!
CommonConstants
.
SUCCESS
.
equals
(
domainR
.
getCode
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"访问员工基础服务异常:"
+((
null
==
domainR
||
null
==
domainR
.
getMsg
())?
""
:
domainR
.
getMsg
())));
String
errorMsg
=
Optional
.
ofNullable
(
domainR
)
.
map
(
R:
:
getMsg
)
.
orElse
(
"未知错误"
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"访问员工基础服务异常:"
+
errorMsg
));
continue
;
}
if
(
null
==
domainR
.
getData
()){
...
...
@@ -2807,19 +2811,32 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//获取项目配置的字典值
postConfigList
=
postConfigMap
.
get
(
excel
.
getDeptNo
());
if
(
null
==
postConfigList
){
if
(
null
==
postConfigList
)
{
postConfigList
=
new
ArrayList
<>();
domainDictR
=
archivesDaprUtil
.
getDictListByDeptNo
(
excel
.
getDeptNo
());
if
(
Common
.
isNotNull
(
domainDictR
)
&&
Common
.
isNotNull
(
domainDictR
.
getData
())
&&
Common
.
isNotNull
(
domainDictR
.
getData
().
getSysAutoDictItemList
()))
{
// 校验响应数据完整性
if
(
Common
.
isNotNull
(
domainDictR
)
&&
Common
.
isNotNull
(
domainDictR
.
getData
())
&&
Common
.
isNotNull
(
domainDictR
.
getData
().
getSysAutoDictItemList
()))
{
List
<
SysAutoDictItem
>
dictItemList
=
domainDictR
.
getData
().
getSysAutoDictItemList
();
for
(
SysAutoDictItem
sysAutoDictItem
:
dictItemList
){
if
(
"post_type"
.
equals
(
sysAutoDictItem
.
getType
())){
postConfigList
.
add
(
sysAutoDictItem
.
getLabel
());
}
}
// 筛选并收集岗位类型标签
dictItemList
.
stream
()
.
filter
(
Objects:
:
nonNull
)
.
filter
(
item
->
"post_type"
.
equals
(
item
.
getType
()))
.
map
(
SysAutoDictItem:
:
getLabel
)
.
filter
(
Objects:
:
nonNull
)
.
forEach
(
postConfigList:
:
add
);
// 仅当获取到有效数据时才缓存
if
(!
postConfigList
.
isEmpty
())
{
postConfigMap
.
put
(
excel
.
getDeptNo
(),
postConfigList
);
}
}
}
// 插入
EmployeeRegistration
insert
=
new
EmployeeRegistration
();
BeanUtil
.
copyProperties
(
excel
,
insert
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3da53131
...
...
@@ -448,6 +448,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isNotNull
(
user
))
{
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
}
//投保状态:待投保
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
...
...
@@ -456,7 +458,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//保费都默认是0
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
if
(
null
==
user
){
if
(
autoFlag
){
userTemp
=
sysUserMap
.
get
(
detail
.
getDeptNo
());
if
(
null
!=
userTemp
){
detail
.
setCreateBy
(
userTemp
.
getUserId
());
...
...
@@ -465,9 +467,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setCreateBy
(
"1"
);
detail
.
setCreateName
(
"自动化派单"
+
"-"
+
success
.
getCustomerUserName
());
}
}
else
{
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
}
detail
.
setId
(
RandomStringUtils
.
randomNumeric
(
19
));
//是否见费出单逻辑处理:预估保费结算、购买周期计算、保单结束日期结算、参保开始日期计算、预计办理日期计算
...
...
@@ -707,10 +706,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isNotNull
(
user
))
{
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
}
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
if
(
null
==
user
){
if
(
autoFlag
){
userTemp
=
sysUserMap
.
get
(
detail
.
getDeptNo
());
if
(
null
!=
userTemp
){
detail
.
setCreateBy
(
userTemp
.
getUserId
());
...
...
@@ -719,9 +720,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setCreateBy
(
"1"
);
detail
.
setCreateName
(
"自动化派单"
+
"-"
+
success
.
getCustomerUserName
());
}
}
else
{
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateName
(
user
.
getNickname
());
}
detailList
.
add
(
detail
);
sourceIdCardList
.
add
(
detail
.
getEmpIdcardNo
());
...
...
@@ -911,11 +909,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isNotNull
(
user
))
{
newDetail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
newDetail
.
setCreateUserDeptName
(
user
.
getDeptName
());
newDetail
.
setCreateBy
(
user
.
getId
());
newDetail
.
setCreateName
(
user
.
getNickname
());
}
newDetail
.
setSignFlag
(
CommonConstants
.
ZERO_INT
);
//创建时间是新数据插入时间
newDetail
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
null
==
user
){
if
(
autoFlag
){
userTemp
=
sysUserMap
.
get
(
newDetail
.
getDeptNo
());
if
(
null
!=
userTemp
){
newDetail
.
setCreateBy
(
userTemp
.
getUserId
());
...
...
@@ -924,9 +924,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail
.
setCreateBy
(
"1"
);
newDetail
.
setCreateName
(
"自动化派单"
+
"-"
+
success
.
getCustomerUserName
());
}
}
else
{
newDetail
.
setCreateBy
(
user
.
getId
());
newDetail
.
setCreateName
(
user
.
getNickname
());
}
//替换不参与结算
...
...
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