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
4a326a7a
Commit
4a326a7a
authored
Jan 24, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
见费出单逻辑-fxj
parent
7f8e22bb
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
16 deletions
+11
-16
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+1
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+1
-1
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+1
-1
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+3
-8
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+2
-2
TDispatchInfoPreController.java
...v1/yifu/social/controller/TDispatchInfoPreController.java
+1
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
4a326a7a
...
...
@@ -341,7 +341,7 @@ public class TEmployeeContractPreController {
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId
"
)
@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/impl/TEmployeeContractPreServiceImpl.java
View file @
4a326a7a
...
...
@@ -1250,7 +1250,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
i
n
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
notI
n
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
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 @
4a326a7a
...
...
@@ -337,7 +337,7 @@ public class TEmployeeInsurancePreController {
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId
"
)
@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/impl/TEmployeeInsurancePreServiceImpl.java
View file @
4a326a7a
...
...
@@ -1008,7 +1008,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
i
n
(
TEmployeeInsurancePre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"5"
))
.
notI
n
(
TEmployeeInsurancePre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"5"
))
.
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 @
4a326a7a
...
...
@@ -1811,6 +1811,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//如果是见费出单,投保中,推送作废 2026-01-22 v1.7.19
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
detail
.
getIsJfcd
())){
//红冲预估推送
detail
.
setDefaultSettleId
(
burden
.
getId
());
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
THREE_INT
);
//已投保 需要处理实缴和差额数据 (已支出或支出中禁止退保)
if
(
CommonConstants
.
THREE_INT
==
detail
.
getBuyHandleStatus
()){
...
...
@@ -1880,14 +1881,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
operateList
.
add
(
e
);
}
});
//如果是见费出单,投保中,推送作废 2026-01-22 v1.7.19
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
detail
.
getIsJfcd
())){
updateEmployeeInsurancePreById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
SEVEN_STRING
);
updateEmployeeInsurancePreRenewById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
SEVEN_STRING
,
true
);
}
else
{
updateEmployeeInsurancePreById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
FIVE_STRING
);
updateEmployeeInsurancePreRenewById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
FIVE_STRING
,
true
);
}
updateEmployeeInsurancePreById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
FIVE_STRING
);
updateEmployeeInsurancePreRenewById
(
detail
,
Stream
.
of
(
"3"
,
"4"
,
"6"
).
collect
(
Collectors
.
toList
()),
CommonConstants
.
FIVE_STRING
,
true
);
}
//更新状态
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @
4a326a7a
...
...
@@ -67,7 +67,7 @@
from
ekp_insurances_info
where
fd_3b0a5743acab7e
= #{id}
and fd_3adfe6af71a1cc = '实缴' limit 1
fd_3b0a5743acab7e
like CONCAT(#{id},'%')
and fd_3adfe6af71a1cc = '实缴' limit 1
</select>
<select
id=
"getSettleStatusFromEkpAsso"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSettleStatusVo"
>
...
...
@@ -100,7 +100,7 @@
ekp_insurances_info
where
fd_3adfe6af71a1cc = '差额' and fd_jfcd='是' and
fd_3b0a5743acab7e like
concact
(#{id},'%')
fd_3b0a5743acab7e like
CONCAT
(#{id},'%')
</select>
<delete
id=
"deleteEkpInsuranceDetail"
>
delete from ekp_insurances_info where fd_3b0a5743acab7e=#{id} and fd_jfcd='是' and fd_3adfe6af71a1cc = '预估'
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoPreController.java
View file @
4a326a7a
...
...
@@ -410,7 +410,7 @@ public class TDispatchInfoPreController {
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/getInfoByRegistId
"
)
@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/impl/TDispatchInfoPreServiceImpl.java
View file @
4a326a7a
...
...
@@ -1069,7 +1069,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
return
R
.
failed
(
CommonConstants
.
PARAM_INFO_ERROR
);
}
return
R
.
ok
(
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
i
n
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
notI
n
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
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