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
ed2ff005
Commit
ed2ff005
authored
Dec 22, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-户配置日志提交
parent
5c424a89
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
88 additions
and
0 deletions
+88
-0
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+13
-0
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+2
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+18
-0
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+11
-0
TInsuranceDetailMapper.java
.../insurances/mapper/insurances/TInsuranceDetailMapper.java
+2
-0
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+2
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+5
-0
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+33
-0
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
ed2ff005
...
...
@@ -442,4 +442,17 @@ public class TEmployeeContractInfoController {
return
tEmployeeContractInfoService
.
selectExitEmpCopntract
(
cardVo
);
}
/**
* @Author huych
* @Description 查询是否存在正常或者在途的合同
* @Date 14:32 2025/12/22
* @Param
* @return
**/
@Operation
(
summary
=
"查询是否存在正常或者在途的合同"
,
description
=
"查询是否存在正常或者在途的合同"
)
@PostMapping
(
"/selectExitEmpContractNew"
)
public
R
selectExitEmpCopntractNew
(
@RequestBody
TEmployeeAutoRegistCheckVo
cardVo
)
{
return
tEmployeeContractInfoService
.
selectExitEmpCopntractNew
(
cardVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
ed2ff005
...
...
@@ -202,6 +202,8 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
Boolean
selectExitEmpCopntract
(
TEmployeeAutoRegistCheckVo
cardVo
);
R
selectExitEmpCopntractNew
(
TEmployeeAutoRegistCheckVo
cardVo
);
// 获取合同ID,在用,已审核
String
getContractByEmpIdCardAndDeptNo
(
String
empIdCard
,
String
deptNo
);
// 查找最近的终止合同
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
ed2ff005
...
...
@@ -2310,6 +2310,24 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
@Override
public
R
selectExitEmpCopntractNew
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
if
(
Common
.
isNotNull
(
cardVo
)
&&
Common
.
isNotNull
(
cardVo
.
getEmpIdcard
())
&&
Common
.
isNotNull
(
cardVo
.
getDeptNo
()))
{
return
R
.
ok
(
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
cardVo
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getDeptNo
,
cardVo
.
getDeptNo
())
.
isNull
(
TEmployeeContractInfo:
:
getSignType
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_INT
)
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)));
}
else
{
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
}
//是否同步终止合同、减项、减档为是的时候 单独写逻辑
public
void
changeStatus
(
TEmployeeContractInfo
contractInfo
,
YifuUser
user
)
{
//同步任务处理清单执行详情
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
ed2ff005
...
...
@@ -916,6 +916,17 @@ public class TInsuranceDetailController {
return
R
.
ok
(
tInsuranceDetailService
.
getOnProcessInsurancesInfo
(
empIdcard
));
}
/**
* 查询在用或者在途的商险数据
* @param empIdcard 身份证号
* @return
*/
@Operation
(
description
=
"查询在用或者在途的商险数据"
)
@PostMapping
(
"/getUnAutoProcessInsuredList"
)
public
R
<
List
<
TInsurancePreDetail
>>
getUnAutoProcessInsuredList
(
@RequestParam
String
empIdcard
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getUnAutoProcessInsuredList
(
empIdcard
));
}
/**
* @param paramVo
* @Description: 查询人员的商险状态
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @
ed2ff005
...
...
@@ -340,6 +340,8 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
List
<
TInsurancePreDetail
>
getOnProcessInsuredList
(
@Param
(
"empIdCard"
)
String
empIdCard
);
List
<
TInsurancePreDetail
>
getUnAutoProcessInsuredList
(
@Param
(
"empIdCard"
)
String
empIdCard
);
List
<
String
>
getInsuranceDetailList
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptNo"
)
String
deptNo
);
List
<
String
>
getInsuranceDetailListByClose
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptNo"
)
String
deptNo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
ed2ff005
...
...
@@ -594,6 +594,8 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
List
<
TInsurancePreDetail
>
getOnProcessInsurancesInfo
(
String
empIdCard
);
List
<
TInsurancePreDetail
>
getUnAutoProcessInsuredList
(
String
empIdCard
);
BaseSearchVO
getInsurancesStatus
(
BaseSearchVO
paramVo
);
BaseSearchVO
getInsurancesStatusByClose
(
BaseSearchVO
paramVo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
ed2ff005
...
...
@@ -9044,6 +9044,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
baseMapper
.
getOnProcessInsuredList
(
empIdCard
);
}
@Override
public
List
<
TInsurancePreDetail
>
getUnAutoProcessInsuredList
(
String
empIdCard
)
{
return
baseMapper
.
getUnAutoProcessInsuredList
(
empIdCard
);
}
//商险各个入口更新待购买列表状态更新
private
void
updateEmployeeInsurancePre
(
String
insurancePreId
,
TInsuranceDetail
insuranceDetail
,
String
status
)
{
TEmployeeInsurancePre
pre
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
ed2ff005
...
...
@@ -623,6 +623,39 @@
AND EMP_IDCARD_NO = #{empIdCard}
</select>
<!-- 派单人员系统已有非自动化的参保明细查询-->
<select
id=
"getUnAutoProcessInsuredList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail"
>
select
a.id as id,
a.EMP_NAME as empName,
a.EMP_IDCARD_NO as empIdcardNo,
a.BUY_TYPE as buyType,
a.DEPT_NO as deptNo,
a.DEPT_NAME as deptName,
a.POST as post,
a.POLICY_START as policyStart,
a.POLICY_END as policyEnd,
a.POLICY_EFFECT as policyEffect,
a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_TYPE_NAME as insuranceTypeName,
a.BUY_STANDARD as buyStandard,
a.BUY_HANDLE_STATUS as buyHandleStatus,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo,
a.IS_ADRESS as isAdress,
a.INSURANCE_PROVINCE_NAME as insuranceProvinceName,
a.INSURANCE_CITY_NAME as insuranceCityName
from
t_insurance_detail a
where
a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0))
AND EMP_IDCARD_NO = #{empIdCard}
and a.create_name not like '自动化%'
</select>
<!-- ***********************减员办理******************************** -->
<!-- 已投保列表分页查询-->
<select
id=
"getInsuredListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo"
>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
ed2ff005
...
...
@@ -1251,6 +1251,7 @@
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')
and a.create_name not like '自动化%'
</select>
<!--tSocialFundInfo简单分页查询-->
<select
id=
"selectUnFundInfoByEmpIdcard"
resultMap=
"unFundInfoMap"
>
...
...
@@ -1274,6 +1275,7 @@
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
and a.fund_status in ('0', '1', '3', '5', '6', '8')
and a.create_name not like '自动化%'
</select>
<select
id=
"selectSocialFundInfoCountByEmpIdcard"
resultType=
"java.lang.Long"
>
SELECT count(1)
...
...
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