Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
d4a55a18
You need to sign in or sign up before continuing.
Commit
d4a55a18
authored
Sep 16, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:新增是否BPO客户字段"
parent
4b11e2b8
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
73 additions
and
23 deletions
+73
-23
EkpInsuranceUtil.java
...om/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java
+6
-0
EKPInsurancePushParam.java
...yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
+7
-0
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+6
-2
EkpInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
+8
-0
InsuranceAddParam.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
+8
-0
InsuranceBatchParam.java
...cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
+8
-0
InsuranceReplaceParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
+8
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+20
-17
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+2
-4
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java
View file @
d4a55a18
...
...
@@ -228,6 +228,12 @@ public class EkpInsuranceUtil {
}
else
{
pushParam
.
setFd_3b0a5937928c8c
(
CommonConstants
.
EMPTY_STRING
);
}
//是否bro客户
if
(
null
!=
param
.
getBpoFlag
()){
pushParam
.
setFd_3b178f8ba1a91c
(
param
.
getBpoFlag
());
}
else
{
pushParam
.
setFd_3b178f8ba1a91c
(
CommonConstants
.
EMPTY_STRING
);
}
return
pushParam
;
}
}
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
View file @
d4a55a18
...
...
@@ -125,6 +125,13 @@ public class EKPInsurancePushParam {
*/
private
String
fd_3b0a5937928c8c
;
/**
* 是否为BPO业务(是、否)
*/
private
String
fd_3b178f8ba1a91c
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
d4a55a18
...
...
@@ -315,8 +315,12 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"减员id"
)
private
String
refundId
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
View file @
d4a55a18
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -176,4 +177,11 @@ public class EkpInteractiveParam implements Serializable {
*/
@Schema
(
description
=
"状态:有,无"
)
private
String
estimateStatus
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
View file @
d4a55a18
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -170,4 +171,11 @@ public class InsuranceAddParam implements Serializable {
*/
@JsonIgnore
private
Integer
insuranceHandleCity
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
View file @
d4a55a18
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -183,4 +184,11 @@ public class InsuranceBatchParam implements Serializable {
*/
@JsonIgnore
private
LocalDate
policyEnd
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
View file @
d4a55a18
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -100,4 +101,11 @@ public class InsuranceReplaceParam implements Serializable {
@JsonIgnore
private
Integer
settleType
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
d4a55a18
...
...
@@ -1494,8 +1494,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
StringUtils
.
isNotBlank
(
defaultSettleId
)){
TInsuranceSettle
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
Integer
isActualPush
=
settle
.
getIsActualPush
();
//如果当前实缴信息未推送,则新增实缴单推送
if
(
settle
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
){
if
(
CommonConstants
.
ZERO_INT
==
isActualPush
){
//保费存储
settle
.
setActualPremium
(
new
BigDecimal
(
success
.
getActualPremium
()));
settle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
...
...
@@ -1516,7 +1517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//如果当前实缴信息已推送,且金额与本次不一致,则推送实缴更新
BigDecimal
bigDecimal
=
new
BigDecimal
(
success
.
getActualPremium
());
boolean
b
=
bigDecimal
.
compareTo
(
detail
.
getActualPremium
())
==
CommonConstants
.
ZERO_INT
;
if
(
CommonConstants
.
ONE_INT
==
settle
.
getIsActualPush
()
&&
b
){
if
(
CommonConstants
.
ONE_INT
==
isActualPush
&&
!
b
){
//推送保费更新
settle
.
setActualPremium
(
bigDecimal
);
settle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
...
...
@@ -1533,21 +1534,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
});
}
else
{
//推送保费更新
settle
.
setActualPremium
(
bigDecimal
);
settle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
settle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
settle
);
//调EKP更新实际保费
detail
.
setActualPremium
(
bigDecimal
);
threadPool
.
execute
(()
->{
String
s
=
pushEstimate
(
detail
,
CommonConstants
.
FOUR_INT
);
if
(
StringUtils
.
isNotBlank
(
s
)){
settle
.
setActualPushTime
(
LocalDateTime
.
now
());
settle
.
setIsActualPush
(
CommonConstants
.
ONE_INT
);
tInsuranceSettleService
.
updateById
(
settle
);
}
});
//推送保费更新
settle
.
setActualPremium
(
bigDecimal
);
settle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
settle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
settle
);
//调EKP更新实际保费
detail
.
setActualPremium
(
bigDecimal
);
threadPool
.
execute
(()
->{
String
s
=
pushEstimate
(
detail
,
CommonConstants
.
FOUR_INT
);
if
(
StringUtils
.
isNotBlank
(
s
)){
settle
.
setActualPushTime
(
LocalDateTime
.
now
());
settle
.
setIsActualPush
(
CommonConstants
.
ONE_INT
);
tInsuranceSettleService
.
updateById
(
settle
);
}});
}
}
}
...
...
@@ -1936,6 +1936,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setBpoFlag
(
projectSetInfoVo
.
getBpoFlag
());
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
}
}
...
...
@@ -2309,6 +2310,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
else
{
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
}
param
.
setBpoFlag
(
projectSetInfoVo
.
getBpoFlag
());
param
.
setDeptId
(
projectSetInfoVo
.
getId
());
}
}
...
...
@@ -2692,6 +2694,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
else
{
param
.
setSettleType
(
Integer
.
parseInt
(
settleType
));
param
.
setDeptId
(
projectSetInfoVo
.
getId
());
param
.
setBpoFlag
(
projectSetInfoVo
.
getBpoFlag
());
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
d4a55a18
...
...
@@ -57,6 +57,7 @@
<result
property=
"createUserDeptId"
column=
"CREATE_USER_DEPT_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"createUserDeptName"
column=
"CREATE_USER_DEPT_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptId"
column=
"DEPT_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"bpoFlag"
column=
"BPO_FLAG"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
ID,EMP_NAME,
...
...
@@ -69,7 +70,7 @@
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SIGN_FLAG,
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
CREATE_BY,CREATE_NAME,CREATE_TIME,
BPO_FLAG,
UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME
</sql>
...
...
@@ -136,9 +137,6 @@
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
and detail.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${tEmployeeInfo.authSql}
</if>
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</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