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
828aa563
Commit
828aa563
authored
Aug 07, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-商险自动化逻辑调整
parent
9e262da2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
88 additions
and
27 deletions
+88
-27
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+30
-17
EmployeePreInsuranceListVo.java
...lus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
+23
-0
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+14
-4
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+9
-4
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+11
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
828aa563
...
@@ -33,10 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
...
@@ -33,10 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
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.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceExitCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -1427,21 +1424,37 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -1427,21 +1424,37 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
public
EmployeeRegistrationPre
getEmployeeRegistrationPreById
(
String
id
)
{
public
EmployeeRegistrationPre
getEmployeeRegistrationPreById
(
String
id
)
{
EmployeeRegistrationPre
pre
=
this
.
getById
(
id
);
EmployeeRegistrationPre
pre
=
this
.
getById
(
id
);
if
(
pre
!=
null
)
{
if
(
pre
!=
null
)
{
// 查原商险,来对比
//判断合同是否已签订 是的话展示商险明细 否的话查询商险待购买数据
R
<
EmployeePreLogListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
pre
.
getInsuranceIsBuy
()))
{
,
"/temployeeinsurancepre/inner/getListByEmpPreId"
,
id
,
EmployeePreLogListVo
.
class
,
SecurityConstants
.
FROM_IN
);
// 查已购买商险明细
List
<
TEmployeeInsurancePre
>
oldList
;
R
<
EmployeePreInsuranceListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
,
daprInsurancesProperties
.
getAppId
()
oldList
=
sdr
.
getData
().
getPreList
();
,
"/temployeeinsurancepre/inner/getExitInsuranceListByEmpPreId"
,
id
for
(
TEmployeeInsurancePre
oldInsurance
:
oldList
)
{
,
EmployeePreInsuranceListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isNotNull
(
oldInsurance
.
getProcessStatus
())
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
||
CommonConstants
.
FOUR_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
pre
.
setExitInsuranceInfoList
(
sdr
.
getData
().
getPreList
());
||
CommonConstants
.
SIX_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
))
{
}
oldInsurance
.
setModelType
(
CommonConstants
.
FOUR_STRING
);
}
else
{
// 查原商险
R
<
EmployeePreLogListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
,
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/getListByEmpPreId"
,
id
,
EmployeePreLogListVo
.
class
,
SecurityConstants
.
FROM_IN
);
List
<
TEmployeeInsurancePre
>
oldList
;
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
oldList
=
sdr
.
getData
().
getPreList
();
for
(
TEmployeeInsurancePre
oldInsurance
:
oldList
)
{
if
(
Common
.
isNotNull
(
oldInsurance
.
getProcessStatus
())
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
SIX_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())))
{
oldInsurance
.
setModelType
(
CommonConstants
.
FOUR_STRING
);
}
}
}
pre
.
setInsurancePreList
(
oldList
);
}
}
pre
.
setInsurancePreList
(
oldList
);
}
}
//获取合同待签订数据
//获取合同待签订数据
TEmployeeContractPre
contract
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
TEmployeeContractPre
contract
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
0 → 100644
View file @
828aa563
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @author huych
* @description 商险自动化已购买商险明细VO
* @date 2025-8-7 10:20:26
*/
@Data
@Schema
(
description
=
"商险自动化已购买商险明细VO"
)
public
class
EmployeePreInsuranceListVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
628032758008497542L
;
private
List
<
TInsurancePreDetail
>
preList
=
new
ArrayList
<>();
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
828aa563
...
@@ -12,10 +12,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
...
@@ -12,10 +12,7 @@ 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.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -277,4 +274,17 @@ public class TEmployeeInsurancePreController {
...
@@ -277,4 +274,17 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
deleteInsuranceByPreId
(
preId
);
return
tEmployeeInsurancePreService
.
deleteInsuranceByPreId
(
preId
);
}
}
/**
* @param empPreId 入职确认信息表ID
* @Description: 获取商险已购买信息
* @Author: huych
* @Date: 2025/8/7 10:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail>>
**/
@Inner
@PostMapping
(
"/inner/getExitInsuranceListByEmpPreId"
)
public
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
@RequestBody
String
empPreId
){
return
tEmployeeInsurancePreService
.
getExitInsuranceListByEmpPreId
(
empPreId
);
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
828aa563
...
@@ -7,10 +7,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
...
@@ -7,10 +7,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
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.util.R
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
import
java.util.List
;
...
@@ -104,4 +101,12 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
...
@@ -104,4 +101,12 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
**/
**/
boolean
deleteInsuranceByPreId
(
String
preId
);
boolean
deleteInsuranceByPreId
(
String
preId
);
/**
* @param empPreId 入职确认信息表ID
* @Description: 获取商险已购买信息
* @Author: huych
* @Date: 2025/8/7 10:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail>>
**/
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
String
empPreId
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
828aa563
...
@@ -419,7 +419,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
...
@@ -419,7 +419,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsEffect
,
CommonConstants
.
ZERO_INT
)
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsEffect
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail:
:
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail:
:
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
THREE_INT
)
.
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
THREE_INT
)
.
or
().
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
TWO_INT
)));
.
or
().
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
TWO_INT
)
.
or
().
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
ONE_INT
)));
return
count
==
preVo
.
getExitInsuranceInfoList
().
size
();
return
count
==
preVo
.
getExitInsuranceInfoList
().
size
();
}
}
return
false
;
return
false
;
...
@@ -674,4 +675,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
...
@@ -674,4 +675,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
true
;
return
true
;
}
}
@Override
public
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
String
empPreId
)
{
EmployeePreInsuranceListVo
vo
=
new
EmployeePreInsuranceListVo
();
List
<
TInsurancePreDetail
>
preList
=
preDetailService
.
list
(
Wrappers
.<
TInsurancePreDetail
>
query
().
lambda
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
empPreId
));
vo
.
setPreList
(
preList
);
return
vo
;
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
828aa563
...
@@ -619,7 +619,7 @@
...
@@ -619,7 +619,7 @@
t_insurance_detail a
t_insurance_detail a
where
where
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS
= 2
or (a.BUY_HANDLE_STATUS = 3 and a.isEffect = 0 and a.isOverdue = 0))
and (a.BUY_HANDLE_STATUS
in (1,2)
or (a.BUY_HANDLE_STATUS = 3 and a.isEffect = 0 and a.isOverdue = 0))
AND EMP_IDCARD_NO = #{empIdCard}
AND EMP_IDCARD_NO = #{empIdCard}
</select>
</select>
...
...
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