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
d7f2dc66
Commit
d7f2dc66
authored
Aug 21, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
ec8bb047
540fede7
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
20 deletions
+48
-20
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+23
-15
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+1
-1
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+10
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+11
-2
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
d7f2dc66
...
...
@@ -246,8 +246,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
String
differenceInsuranceKey
;
//如果服务类型包含商险处理商险明细数据
newInfo
.
setId
(
empPreId
);
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
//是否已购买商险单独加日志
if
(
Common
.
isEmpty
(
isBuyOld
)
||
(
Common
.
isNotNull
(
isBuyOld
)
&&
!
isBuyOld
.
equals
(
isBuyNew
)))
{
//单独记录是否已购买商险的变更记录
differenceInsuranceKey
=
"insuranceIsBuy"
;
...
...
@@ -262,9 +266,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
//如果服务类型包含商险处理商险明细数据
newInfo
.
setId
(
empPreId
);
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
}
...
...
@@ -341,6 +342,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
diffTitle
=
"商险信息"
;
}
}
}
else
{
// 没有变更
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、商险信息"
;
}
else
{
diffTitle
=
"商险信息"
;
}
}
String
differenceContractKey
=
null
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
d7f2dc66
...
...
@@ -553,7 +553,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
}
else
{
tGzEmpInfo
.
setUpdateBy
(
user
.
getId
());
tGzEmpInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
// 1.7.14: 档案状态是提交,更新
创建时间(提交时间)
// 1.7.14: 档案状态是提交,更新
提交时间
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
setSubmitTime
(
LocalDateTime
.
now
());
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
d7f2dc66
...
...
@@ -3882,7 +3882,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//本次派单人员系统已有参保明细 如果是二次派单则无需校验
if
(
Common
.
isEmpty
(
param
.
getIsExit
()))
{
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
get
Replace
EmpIdcardNo
());
if
(
Common
.
isNotNull
(
listInsured
)
&&
!
listInsured
.
isEmpty
())
{
param
.
setIsExit
(
CommonConstants
.
ONE_STRING
);
param
.
setErrorMessage
(
InsurancesConstants
.
DIS_PERSON_DATA_IS_EXIST
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
d7f2dc66
...
...
@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty
(
"派单ID"
)
private
String
dispatchId
;
/**
* 社保ID(取值最新办理成功的社保ID)
*/
@Length
(
max
=
32
,
message
=
"社保ID(取值最新办理成功的社保ID) 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"社保ID(取值最新办理成功的社保ID)"
,
maxLength
=
32
)
@Schema
(
description
=
"社保ID(取值最新办理成功的社保ID)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保ID(取值最新办理成功的社保ID)"
)
private
String
socialIdSuccess
;
// 执行月份,整体调基使用的
@TableField
(
exist
=
false
)
private
String
doMonth
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
d7f2dc66
...
...
@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
sf
.
setSocialAddStatus
(
CommonConstants
.
FIVE_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
TEN_STRING
);
//如果是部分办理失败的恢复最新的socialId ,避免后面派减取值问题
if
(
null
!=
sf
.
getSocialIdSuccess
()){
sf
.
setSocialId
(
sf
.
getSocialIdSuccess
());
}
}
socialInfo
.
setAuditTime
(
now
);
socialInfo
.
setAuditUser
(
user
.
getId
());
...
...
@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo
.
setHandleTime
(
now
);
socialInfo
.
setHandleUser
(
user
.
getId
());
socialInfo
.
setHandleUserName
(
user
.
getNickname
());
//如果派单有办理成功项 就把最新的办理成功的社保明细ID存储到社保公积金查询中 20250820 修复部分办理成功后派减的问题
if
(
CommonConstants
.
ONE_STRING
.
equals
(
handleStatus
)){
sf
.
setSocialIdSuccess
(
socialInfo
.
getId
());
}
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
...
...
@@ -4598,8 +4606,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
//社保公积金派减办理成功
if
((
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
&&
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
(
))
&&
(
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
sf
.
getSocialStatus
()
))
&&
(
CommonConstants
.
SEVEN_STRING
.
equals
(
sf
.
getFundStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getFundStatus
())
||
Common
.
isEmpty
(
sf
.
getFundStatus
())))
||
(
CommonConstants
.
ZERO_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ONE_INT
==
flag
&&
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
d7f2dc66
...
...
@@ -164,6 +164,7 @@
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"fundStatus"
column=
"FUND_STATUS"
/>
<result
property=
"dispatchId"
column=
"DISPATCH_ID"
/>
<result
property=
"socialIdSuccess"
column=
"SOCIAL_ID_SUCCESS"
/>
</resultMap>
...
...
@@ -530,7 +531,7 @@
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS,
a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
,a.SOCIAL_ID_SUCCESS
</sql>
<sql
id=
"tSocialFundInfo_where"
>
<if
test=
"tSocialFundInfo != null"
>
...
...
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