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
3132739c
Commit
3132739c
authored
Aug 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
c34973fc
685056be
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
19 deletions
+32
-19
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+1
-0
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+16
-15
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+5
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+10
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
3132739c
...
@@ -703,6 +703,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -703,6 +703,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
}
}
}
else
{
}
else
{
employeeRegistrationPre
.
setInsuranceIsBuy
(
""
);
// 2:保存时不存在商险类型,判断是否有不可删除的数据,有则拒绝:
// 2:保存时不存在商险类型,判断是否有不可删除的数据,有则拒绝:
if
(
oldList
!=
null
&&
!
oldList
.
isEmpty
())
{
if
(
oldList
!=
null
&&
!
oldList
.
isEmpty
())
{
for
(
TEmployeeInsurancePre
oldInsurance:
oldList
)
{
for
(
TEmployeeInsurancePre
oldInsurance:
oldList
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
3132739c
...
@@ -246,25 +246,26 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -246,25 +246,26 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 是否修改了商险
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
TEmployeePreLogDetail
detailInsuranceLog
;
if
(
Common
.
isEmpty
(
isBuyOld
)
||
(
Common
.
isNotNull
(
isBuyOld
)
&&
!
isBuyOld
.
equals
(
isBuyNew
)))
{
String
differenceInsuranceKey
;
//单独记录是否已购买商险的变更记录
differenceInsuranceKey
=
"insuranceIsBuy"
;
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
Map
<
String
,
Object
>
old
=
new
HashMap
<>();
old
.
put
(
"insuranceIsBuy"
,
isBuyOld
);
Map
<
String
,
Object
>
simNew
=
new
HashMap
<>();
simNew
.
put
(
"insuranceIsBuy"
,
isBuyNew
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
//如果服务类型包含商险处理商险明细数据
//如果服务类型包含商险处理商险明细数据
newInfo
.
setId
(
empPreId
);
newInfo
.
setId
(
empPreId
);
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
//是否已购买商险单独加日志
if
(
Common
.
isEmpty
(
isBuyOld
)
||
(
Common
.
isNotNull
(
isBuyOld
)
&&
!
isBuyOld
.
equals
(
isBuyNew
)))
{
//单独记录是否已购买商险的变更记录
differenceInsuranceKey
=
"insuranceIsBuy"
;
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
Map
<
String
,
Object
>
old
=
new
HashMap
<>();
old
.
put
(
"insuranceIsBuy"
,
isBuyOld
);
Map
<
String
,
Object
>
simNew
=
new
HashMap
<>();
simNew
.
put
(
"insuranceIsBuy"
,
isBuyNew
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
}
}
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
3132739c
...
@@ -472,10 +472,14 @@ public class InsurancesConstants {
...
@@ -472,10 +472,14 @@ public class InsurancesConstants {
* 商险已结算,无法登记保单保费
* 商险已结算,无法登记保单保费
*/
*/
public
static
final
String
SETTLE_HANDLE_THREE_NOT_REGISTERED
=
"商险已结算,无法登记保单保费"
;
public
static
final
String
SETTLE_HANDLE_THREE_NOT_REGISTERED
=
"商险已结算,无法登记保单保费"
;
/**
* 商险支出中,无法登记保单保费
*/
public
static
final
String
PAY_SETTLE_ONE_NOT_REGISTERED
=
"商险支出中,无法登记保单保费"
;
/**
/**
* 商险已支出,无法登记保单保费
* 商险已支出,无法登记保单保费
*/
*/
public
static
final
String
PAY_SETTLE_NOT_REGISTERED
=
"商险已支出,无法登记保单保费"
;
public
static
final
String
PAY_SETTLE_
TWO_
NOT_REGISTERED
=
"商险已支出,无法登记保单保费"
;
/**
/**
* 保单号不存在或已过期
* 保单号不存在或已过期
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3132739c
...
@@ -4123,9 +4123,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -4123,9 +4123,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
}
}
// 商险已支出,无法登记保单保费
// 商险已支出,无法登记保单保费
if
(
Common
.
isNotNull
(
settleStatus
.
getPayStatus
())
&&
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getPayStatus
()))
{
if
(
Common
.
isNotNull
(
settleStatus
.
getPayStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
PAY_SETTLE_NOT_REGISTERED
);
//保费更新或者保单号发票号更新
continue
;
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getPayStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
PAY_SETTLE_TWO_NOT_REGISTERED
);
continue
;
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleStatus
.
getPayStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
PAY_SETTLE_ONE_NOT_REGISTERED
);
continue
;
}
}
}
}
}
}
}
...
...
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