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
438bdd8f
You need to sign in or sign up before continuing.
Commit
438bdd8f
authored
Sep 01, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
b974e000
b61b5848
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
81 additions
and
61 deletions
+81
-61
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+4
-4
InsuranceDetailVO.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
+6
-0
InsuredOrderListVo.java
.../cloud/plus/v1/yifu/insurances/vo/InsuredOrderListVo.java
+6
-0
InsuredOrderParam.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuredOrderParam.java
+3
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+22
-17
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+40
-38
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
438bdd8f
...
...
@@ -995,14 +995,14 @@ public class InsurancesConstants {
public
static
final
String
SETTLE_ZERO
=
"未结算"
;
/**
*
已结算
*
结算中
*/
public
static
final
String
SETTLE_ONE
=
"
已结算
"
;
public
static
final
String
SETTLE_ONE
=
"
结算中
"
;
/**
*
结算中
*
已结算
*/
public
static
final
String
SETTLE_TWO
=
"
结算中
"
;
public
static
final
String
SETTLE_TWO
=
"
已结算
"
;
/**
* 无需结算
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
View file @
438bdd8f
...
...
@@ -325,6 +325,12 @@ public class InsuranceDetailVO implements Serializable {
@Schema
(
description
=
"被替换人项目名称(替换类型专用字段)"
)
private
String
coverProjectName
;
/**
* 被替换人封面抬头
*/
@Schema
(
description
=
"被替换人封面抬头"
)
private
String
coveInvoiceTitle
;
/**
* 退保金额 todo 数据库暂时没有
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredOrderListVo.java
View file @
438bdd8f
...
...
@@ -78,6 +78,12 @@ public class InsuredOrderListVo implements Serializable {
@Schema
(
description
=
"创建人(派单人)"
)
private
String
createName
;
/**
* 创建人id
*/
@Schema
(
description
=
"创建人id(派单人id)"
)
private
String
createBy
;
/**
* 创建人部门名称
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredOrderParam.java
View file @
438bdd8f
...
...
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
import
java.util.List
;
/**
...
...
@@ -37,13 +38,13 @@ public class InsuredOrderParam implements Serializable {
* 开始日期
*/
@Schema
(
description
=
"开始日期"
)
private
String
startDate
;
private
LocalDate
startDate
;
/**
* 结束日期
*/
@Schema
(
description
=
"结束日期"
)
private
String
endDate
;
private
LocalDate
endDate
;
/**
* 项目编码列表
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
438bdd8f
...
...
@@ -1030,7 +1030,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
//todo 判断是否推送过保费到ekp,如果推送过就新增一条负的,将结算表中的数据求和放到明细表中
for
(
TInsuranceDetail
detail
:
successList
)
{
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
TInsuranceSettle
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
...
...
@@ -1051,6 +1050,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
}
tInsuranceSettleService
.
save
(
burden
);
SettleVo
settleVo
=
getInsuranceDetailSettleStatus
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(!
Common
.
isEmpty
(
settleVo
)
&&
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getEstimateStatus
())
&&
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
())){
//推送负的给ekp
String
s
=
pushEstimate
(
detail
,
CommonConstants
.
THREE_INT
);
//这里退回的时候,必须置为null,防止是实缴的时候,登记保费出错
...
...
@@ -1058,6 +1059,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setDefaultSettleId
(
null
);
}
}
}
}
//获取成功数据的remark
paramList
.
stream
().
forEach
(
e
->{
...
...
@@ -3169,13 +3172,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
null
!=
jsonObject
){
record
.
setProjectName
(
Optional
.
ofNullable
(
jsonObject
.
getDepartName
()).
orElse
(
""
));
}
TInsuranceDetail
detail
=
new
TInsuranceDetail
(
);
TInsuranceDetail
detail
=
getById
(
record
.
getId
()
);
TInsuranceRefund
refund
=
new
TInsuranceRefund
();
detail
.
setId
(
record
.
getId
());
//update状态由「待减员」置为「减员中」
detail
.
setUpdateBy
(
user
.
getId
());
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
detail
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
detailList
.
add
(
detail
);
refund
.
setId
(
detail
.
getRefundId
());
refund
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
...
...
@@ -4496,13 +4500,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
SettleVo
settleVo
=
getInsuranceDetailSettleStatus
(
insuranceDetail
.
getId
(),
defaultSettleId
);
if
(!
Common
.
isEmpty
(
settleVo
)){
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_
HANDLE_TWO_NOT_REGISTERED
);
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
get
EstimateStatus
())
||
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
get
ActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_
MONTH_CHANGE_SETTLE_STATUS_TWO_ERROR
);
errorList
.
add
(
param
);
continue
;
}
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_
HANDLE_THREE_NOT_REGISTERED
);
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
get
EstimateStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
get
ActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_
MONTH_CHANGE_SETTLE_STATUS_THREE_ERROR
);
errorList
.
add
(
param
);
continue
;
}
...
...
@@ -5003,13 +5007,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
SettleVo
settleVo
=
getInsuranceDetailSettleStatus
(
insuranceDetail
.
getId
(),
defaultSettleId
);
if
(!
Common
.
isEmpty
(
settleVo
)){
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
get
EstimateStatus
())
||
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
get
ActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_CHANGE_SETTLE_STATUS_TWO_ERROR
);
errorList
.
add
(
param
);
continue
;
}
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
get
EstimateStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
get
ActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_CHANGE_SETTLE_STATUS_THREE_ERROR
);
errorList
.
add
(
param
);
continue
;
}
...
...
@@ -5387,11 +5391,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
pushType
=
CommonConstants
.
SEVEN_INT
;
}
if
(
StringUtils
.
isBlank
(
eKPInsuranceUtil
.
sendToEkp
(
param
))){
String
s
=
eKPInsuranceUtil
.
sendToEkp
(
param
);
if
(
StringUtils
.
isBlank
(
s
)){
saveInsuranceEkp
(
param
,
pushType
);
return
null
;
}
else
{
return
eKPInsuranceUtil
.
sendToEkp
(
param
)
;
return
s
;
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
438bdd8f
This diff is collapsed.
Click to expand it.
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