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
064de39b
Commit
064de39b
authored
Feb 28, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入职确认修改社保及公积金是的时候逻辑调整-fxj
parent
dcc34958
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
91 additions
and
41 deletions
+91
-41
TSocialFundInfoController.java
.../v1/yifu/social/controller/TSocialFundInfoController.java
+6
-4
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+4
-2
TSocialFundInfoService.java
...d/plus/v1/yifu/social/service/TSocialFundInfoService.java
+3
-3
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+23
-4
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+55
-28
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java
View file @
064de39b
...
...
@@ -233,8 +233,9 @@ public class TSocialFundInfoController {
@Operation
(
summary
=
"通过身份证查询在途或在保的数据"
,
description
=
"通过身份证查询在途或在保的数据"
)
@PostMapping
(
"/selectUnSocialFundInfoByEmpIdcard"
)
public
R
<
List
<
UnSocialFundInfoVo
>>
selectUnSocialFundInfoByEmpIdcard
(
@RequestParam
String
empIdcard
,
@RequestParam
(
required
=
false
)
String
type
)
{
return
R
.
ok
(
tSocialFundInfoService
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
,
type
));
@RequestParam
(
required
=
false
)
String
type
,
@RequestParam
(
required
=
false
)
String
socialPreId
)
{
return
R
.
ok
(
tSocialFundInfoService
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
,
type
,
socialPreId
));
}
/**
...
...
@@ -246,8 +247,9 @@ public class TSocialFundInfoController {
@Operation
(
summary
=
"通过身份证查询在途或在保的公积金数据"
,
description
=
"通过身份证查询在途或在保的公积金数据"
)
@PostMapping
(
"/selectUnFundInfoByEmpIdcard"
)
public
R
<
List
<
UnFundInfoVo
>>
selectUnFundInfoByEmpIdcard
(
@RequestParam
String
empIdcard
,
@RequestParam
(
required
=
false
)
String
type
)
{
return
R
.
ok
(
tSocialFundInfoService
.
selectUnFundInfoByEmpIdcard
(
empIdcard
,
type
));
@RequestParam
(
required
=
false
)
String
type
,
@RequestParam
(
required
=
false
)
String
fundPreId
)
{
return
R
.
ok
(
tSocialFundInfoService
.
selectUnFundInfoByEmpIdcard
(
empIdcard
,
type
,
fundPreId
));
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
064de39b
...
...
@@ -98,13 +98,15 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
**/
List
<
String
>
getSocialWorkInjuryList
();
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
,
@Param
(
"type"
)
String
type
);
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
,
@Param
(
"dispatchId"
)
String
dispatchId
);
long
selectSocialFundInfoCountByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
);
long
selectFundCountByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
);
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
,
@Param
(
"type"
)
String
type
);
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
,
@Param
(
"dispatchId"
)
String
dispatchId
);
// 离职待办专用,查询社保ID与状态(主要派增部分失败与成功的)
TSocialFundInfo
getSocialStatus
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptNo"
)
String
deptNo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundInfoService.java
View file @
064de39b
...
...
@@ -96,7 +96,9 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
SocialFundVo
getSocialAndFundReduceListByEmpIdCardSet
(
Set
<
String
>
empIdCardSet
);
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
);
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
,
String
socialPreId
);
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
,
String
fundPreId
);
Boolean
selectExitEmpSocail
(
TEmployeeAutoRegistCheckVo
cardVo
);
...
...
@@ -109,8 +111,6 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
**/
Boolean
selectExitEmpFund
(
TEmployeeAutoRegistCheckVo
cardVo
);
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
);
/**
* @param paramVo
* @Description: 查询正常的社保、公积金
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
064de39b
...
...
@@ -46,6 +46,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
...
...
@@ -83,6 +84,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
private
final
SysBaseSetInfoService
sysBaseSetInfoService
;
private
final
TSocialFundHistoryService
tSocialFundHistoryService
;
private
final
TDispatchInfoPreMapper
tDispatchInfoPreMapper
;
/**
* 社保公积金查询表简单分页查询
*
...
...
@@ -954,12 +957,28 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
}
@Override
public
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
)
{
return
baseMapper
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
,
type
);
public
List
<
UnSocialFundInfoVo
>
selectUnSocialFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
,
String
socialPreId
)
{
String
dispatchId
=
null
;
if
(
Common
.
isNotNull
(
socialPreId
)){
TDispatchInfoPre
socialPre
=
tDispatchInfoPreMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getId
,
socialPreId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
null
!=
socialPre
){
dispatchId
=
socialPre
.
getDispatcherId
();
}
}
return
baseMapper
.
selectUnSocialFundInfoByEmpIdcard
(
empIdcard
,
dispatchId
);
}
@Override
public
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
)
{
return
baseMapper
.
selectUnFundInfoByEmpIdcard
(
empIdcard
,
type
);
public
List
<
UnFundInfoVo
>
selectUnFundInfoByEmpIdcard
(
String
empIdcard
,
String
type
,
String
fundPreId
)
{
String
dispatchId
=
null
;
if
(
Common
.
isNotNull
(
fundPreId
))
{
TDispatchInfoPre
fundPre
=
tDispatchInfoPreMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getId
,
fundPreId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
null
!=
fundPre
){
dispatchId
=
fundPre
.
getDispatcherId
();
}
}
return
baseMapper
.
selectUnFundInfoByEmpIdcard
(
empIdcard
,
dispatchId
);
}
@Override
public
Boolean
selectExitEmpSocail
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
064de39b
...
...
@@ -1245,32 +1245,46 @@
<!--tSocialFundInfo简单分页查询-->
<select
id=
"selectUnSocialFundInfoByEmpIdcard"
resultMap=
"unSocialFundInfoMap"
>
SELECT a.ID,
a.SOCIAL_HOUSEHOLD_NAME,
a.PAYMENT_TYPE,
a.SOCIAL_STATUS,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
d.CREATE_NAME as dispatchName,
a.PENSION_START,
a.MEDICAL_START,
a.UNEMPLOY_START,
a.WORK_INJURY_START,
a.BIRTH_START,
a.BIGAILMENT_START,
a.RECORD_BASE,
a.TRUST_REMARK,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
a.SOCIAL_HOUSEHOLD_NAME,
a.PAYMENT_TYPE,
a.SOCIAL_STATUS,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
d.CREATE_NAME as dispatchName,
a.PENSION_START,
a.MEDICAL_START,
a.UNEMPLOY_START,
a.WORK_INJURY_START,
a.BIRTH_START,
a.BIGAILMENT_START,
a.RECORD_BASE,
a.TRUST_REMARK,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
FROM t_social_fund_info a
inner join t_dispatch_info d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.SOCIAL_ID is not null
inner join
(
SELECT
t.CREATE_NAME,t.CREATE_TIME,t.EMP_IDCARD
FROM
t_dispatch_info t
WHERE
t.DELETE_FLAG = '0'
AND t.type = '0'
AND t.SOCIAL_ID IS NOT NULL
AND t.`STATUS` != '3'
<!-- 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败(原-办理失败) 3 部分办理成功 4 办理中 -->
AND t.SOCIAL_HANDLE_STATUS IN ('0','1','3','4')
AND t.EMP_IDCARD =#{empIdcard}
<if
test=
"dispatchId != null and dispatchId != ''"
>
AND t.id != #{dispatchId}
</if>
) d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard}
<!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) -->
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
<if
test=
"type != null and type != '' and type == 1"
>
and d.create_name not like '自动化%'
</if>
group by a.ID
</select>
<!--tSocialFundInfo简单分页查询-->
...
...
@@ -1291,13 +1305,26 @@
a.PROVIDENT_START,
a.UNIT_PROVIDENG_CARDINAL
FROM t_social_fund_info a
inner join t_dispatch_info d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.FUND_ID is not null
inner join (
SELECT
t.CREATE_NAME,t.CREATE_TIME,t.EMP_IDCARD
FROM
t_dispatch_info t
WHERE
t.DELETE_FLAG = '0'
AND t.type = '0'
AND t.FUND_ID IS NOT NULL
AND t.`STATUS` != '3'
<!-- 公积金办理状态:0 未办理 1办理成功 2 办理失败 -->
AND t.FUND_HANDLE_STATUS IN ('0','1')
AND t.EMP_IDCARD =#{empIdcard}
<if
test=
"dispatchId != null and dispatchId != ''"
>
AND t.id != #{dispatchId}
</if>
) d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard}
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
and a.fund_status in ('0', '1', '3', '5', '6', '8')
<if
test=
"type != null and type != '' and type == 1"
>
and d.create_name not like '自动化%'
</if>
group by a.ID
</select>
<select
id=
"selectSocialFundInfoCountByEmpIdcard"
resultType=
"java.lang.Long"
>
...
...
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