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
573d1f7f
Commit
573d1f7f
authored
Jan 23, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
见费出单逻辑-fxj
parent
7537c978
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
87 additions
and
4 deletions
+87
-4
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+11
-0
TEmployeeContractPreService.java
...v1/yifu/archives/service/TEmployeeContractPreService.java
+2
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+9
-1
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+12
-0
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+2
-0
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+9
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+6
-0
TInsurancePreRenewDetailServiceImpl.java
...e/insurance/impl/TInsurancePreRenewDetailServiceImpl.java
+2
-2
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+12
-1
TDispatchInfoPreController.java
...v1/yifu/social/controller/TDispatchInfoPreController.java
+12
-0
TDispatchInfoPreService.java
.../plus/v1/yifu/social/service/TDispatchInfoPreService.java
+3
-0
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+7
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
573d1f7f
...
...
@@ -334,4 +334,15 @@ public class TEmployeeContractPreController {
public
R
contractUrg
(
@RequestParam
String
id
)
{
return
tEmployeeContractPreService
.
contractUrg
(
id
);
}
/**
* 通过id查询合同待签订任务记录表
* @param registId
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId "
)
public
R
<
TEmployeeContractPre
>
getInfoByRegistId
(
@RequestParam
(
"registId"
)
String
registId
)
{
return
tEmployeeContractPreService
.
getInfoByRegistId
(
registId
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreService.java
View file @
573d1f7f
...
...
@@ -103,4 +103,6 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
* @return
*/
R
contractUrg
(
String
id
);
R
<
TEmployeeContractPre
>
getInfoByRegistId
(
String
registId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
573d1f7f
...
...
@@ -1244,5 +1244,13 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
}
}
@Override
public
R
<
TEmployeeContractPre
>
getInfoByRegistId
(
String
registId
)
{
if
(
Common
.
isEmpty
(
registId
))
{
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getRegisterId
,
registId
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)));
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
573d1f7f
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
...
...
@@ -329,4 +330,15 @@ public class TEmployeeInsurancePreController {
}
return
tEmployeeInsurancePreService
.
delInsurancePreByRegisterId
(
preVo
);
}
/**
* 通过id查询商险待签订任务记录表
* @param registId
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId "
)
public
R
<
TEmployeeInsurancePre
>
getInfoByRegistId
(
@RequestParam
(
"registId"
)
String
registId
)
{
return
tEmployeeInsurancePreService
.
getInfoByRegistId
(
registId
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
573d1f7f
...
...
@@ -134,4 +134,6 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
,
List
<
InsuranceReplaceParam
>
replaceParamList
);
Boolean
delInsurancePreByRegisterId
(
BaseSearchVO
preVo
);
R
<
TEmployeeInsurancePre
>
getInfoByRegistId
(
String
registId
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
573d1f7f
...
...
@@ -1000,4 +1000,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
this
.
remove
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
preVo
.
getRegisterId
()));
}
@Override
public
R
<
TEmployeeInsurancePre
>
getInfoByRegistId
(
String
registId
)
{
if
(
Common
.
isEmpty
(
registId
)){
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
registId
).
last
(
CommonConstants
.
LAST_ONE_SQL
)));
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
573d1f7f
...
...
@@ -9789,11 +9789,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
viewVoList
!=
null
&&
!
viewVoList
.
isEmpty
())
{
String
insuranceId
;
List
<
String
>
insuranceIds
=
new
ArrayList
<>();
TInsuranceDetail
detailOld
=
null
;
for
(
EkpInsuranceViewVo
viewVo
:
viewVoList
)
{
//获取所有的明细id
if
(
Common
.
isNotNull
(
viewVo
.
getId
()))
{
insuranceId
=
viewVo
.
getId
().
substring
(
0
,
19
);
detail
=
baseMapper
.
selectById
(
insuranceId
);
detailOld
=
new
TInsuranceDetail
();
BeanCopyUtils
.
copyProperties
(
detail
,
detailOld
);
//见费出单且是待投保状态 直接回退到 待缴费 并清空缴费时间和缴费状态
if
(
Common
.
isNotNull
(
detail
)
&&
CommonConstants
.
ONE_INT
==
detail
.
getBuyHandleStatus
().
intValue
()
...
...
@@ -9801,7 +9804,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setPaymentTime
(
CommonConstants
.
EMPTY_STRING
);
detail
.
setPaymentStatus
(
CommonConstants
.
ZERO_STRING
);
detail
.
setBuyHandleStatus
(
CommonConstants
.
SIX_INT
);
detail
.
setUpdateBy
(
"05501879fed711eca3540242ac110010"
);
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
baseMapper
.
updateById
(
detail
);
tBusinessOperateService
.
saveModificationRecord
(
detail
.
getId
(),
detailOld
,
detail
,
"收款结算单退单或撤销匹配同步更新投保状态为待缴费"
);
insuranceIds
.
add
(
insuranceId
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsurancePreRenewDetailServiceImpl.java
View file @
573d1f7f
...
...
@@ -379,10 +379,10 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
List
<
InsuranceAutoParam
>
autoAddParamList
=
this
.
getInsuranceAutoParamList
(
paramList
,
batchParamList
,
replaceParamList
);
if
(
autoAddParamList
.
isEmpty
())
{
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
/*
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(TInsurancePreRenewDetail::getId, pushIdList)
.set(TInsurancePreRenewDetail::getProcessStatus, CommonConstants.THREE_STRING);
this
.
update
(
updateWrapper
);
this.update(updateWrapper);
*/
}
else
{
// 将 autoAddParamList 中的id等信息提取出来,放入一个 Set 中
Set
<
String
>
autoAddParamSet
=
new
HashSet
<>();
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
573d1f7f
...
...
@@ -22,6 +22,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetail
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsurancePreRenewDetailMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TUpdateStatusErrorMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TBusinessOperateService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleCancelService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService
;
...
...
@@ -86,7 +87,8 @@ public class DoJointInsuranceTask {
@Autowired
private
TInsurancePreRenewDetailMapper
tInsurancePreRenewDetailMapper
;
@Autowired
private
TBusinessOperateService
tBusinessOperateService
;
/**
* @Description: 商险明细推送
* @Author: huyc
...
...
@@ -248,6 +250,8 @@ public class DoJointInsuranceTask {
detail
=
insuranceDetailMapper
.
selectById
(
insuranceId
);
log
.
error
(
"更新状态商险ID:"
+
detail
.
getId
()
+
"|"
+
insuranceId
);
if
(
Common
.
isNotNull
(
detail
))
{
TInsuranceDetail
detailOld
=
new
TInsuranceDetail
();
BeanCopyUtils
.
copyProperties
(
detail
,
detailOld
);
//判断订单类型是预估还是实缴
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
viewVo
.
getOrderType
()))
{
//判断是收入还是支出结算单号
...
...
@@ -270,6 +274,10 @@ public class DoJointInsuranceTask {
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
detail
.
setPaymentStatus
(
CommonConstants
.
ONE_STRING
);
detail
.
setPaymentTime
(
DateUtil
.
formatDatePatten
(
new
Date
(),
DateUtil
.
DATETIME_PATTERN_SECOND
));
detail
.
setUpdateBy
(
"05501879fed711eca3540242ac110010"
);
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
//添加日期
tBusinessOperateService
.
saveModificationRecord
(
detail
.
getId
(),
detailOld
,
detail
,
"收款结算单已收或垫付同步更新投保状态为待投保"
);
//更新自动化
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getInsurancesId
,
detail
.
getId
());
...
...
@@ -286,6 +294,9 @@ public class DoJointInsuranceTask {
detail
.
setBuyHandleStatus
(
CommonConstants
.
SIX_INT
);
detail
.
setPaymentStatus
(
CommonConstants
.
ZERO_STRING
);
detail
.
setPaymentTime
(
CommonConstants
.
EMPTY_STRING
);
detail
.
setUpdateBy
(
"05501879fed711eca3540242ac110010"
);
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
tBusinessOperateService
.
saveModificationRecord
(
detail
.
getId
(),
detailOld
,
detail
,
"收款结算单退单或撤销匹配同步更新投保状态为待缴费"
);
}
}
}
else
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoPreController.java
View file @
573d1f7f
...
...
@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfoPre
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoPreService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreSearchVo
;
...
...
@@ -402,4 +403,15 @@ public class TDispatchInfoPreController {
public
void
pushDisConfrimSocial
()
{
tDispatchInfoPreService
.
pushDisConfrimSocial
();
}
/**
* 通过id查询社保或公积金待签订任务记录表
* @param registId
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId "
)
public
R
<
TDispatchInfoPre
>
getInfoByRegistId
(
@RequestParam
(
"registId"
)
String
registId
,
@RequestParam
(
"type"
)
String
type
)
{
return
tDispatchInfoPreService
.
getInfoByRegistId
(
registId
,
type
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoPreService.java
View file @
573d1f7f
...
...
@@ -106,4 +106,7 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> {
R
confirmFund
(
List
<
String
>
idList
);
Boolean
getFundPreStatus
(
String
id
);
R
<
TDispatchInfoPre
>
getInfoByRegistId
(
String
registId
,
String
type
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
573d1f7f
...
...
@@ -1062,4 +1062,11 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
}
}
}
@Override
public
R
<
TDispatchInfoPre
>
getInfoByRegistId
(
String
registId
,
String
type
)
{
if
(
Common
.
isEmpty
(
registId
)
||
Common
.
isEmpty
(
type
))
{
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
().
eq
(
TDispatchInfoPre:
:
getTypeSub
,
type
).
eq
(
TDispatchInfoPre:
:
getRegisterId
,
registId
).
last
(
CommonConstants
.
LAST_ONE_SQL
)));
}
}
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