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
d2a28e98
You need to sign in or sign up before continuing.
Commit
d2a28e98
authored
Aug 03, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:优化项目变更提示语句"
parent
e3b651e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+3
-2
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+8
-4
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
d2a28e98
...
...
@@ -92,6 +92,7 @@ public class InsurancesConstants {
* 项目编码不存在
*/
public
static
final
String
DEPT_NO_IS_NOT_EXIST
=
"项目编码不存在"
;
/**
* 替换员工项目不存在
*/
...
...
@@ -477,9 +478,9 @@ public class InsurancesConstants {
/**
* 替换项目
ID和原有项目ID相同
* 替换项目
编码和原编码一致
*/
public
static
final
String
DEPT_NO_IDENTICAL
=
"替换项目
ID和原有项目ID相同
"
;
public
static
final
String
DEPT_NO_IDENTICAL
=
"替换项目
编码和原编码一致
"
;
/**
* 重复数据
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
d2a28e98
...
...
@@ -2754,7 +2754,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
//变更后为单独结算
if
(
CommonConstants
.
ONE_INT
==
newSettleType
){
update
(
updateWrapper
);
//作废旧的数据,生成作废结算信息记录
TInsuranceSettleCancel
cancel
=
new
TInsuranceSettleCancel
();
cancel
.
setDeptNo
(
success
.
getOldDeptNo
());
...
...
@@ -2764,6 +2763,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
cancel
.
setCreateTime
(
LocalDateTime
.
now
());
tInsuranceSettleCancelService
.
save
(
cancel
);
//推送EKP // TODO: 2022/8/2
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
insuranceDetailId
);
//如果已经推送过实际保费,则先作废,再推送新的预估保费和实际保费
if
(
byId
.
getIsActualPush
()
==
1
){
}
//新增新的结算数据
TInsuranceSettle
newInsuranceSettle
=
new
TInsuranceSettle
();
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
...
...
@@ -2909,7 +2913,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
updateWrapper
.
set
(
TInsuranceDetail
::
getEstimatePremium
,
new
BigDecimal
(
"0.00"
));
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
null
);
update
(
updateWrapper
);
}
//变更为合并结算
if
(
CommonConstants
.
ZERO_INT
==
newSettleType
){
...
...
@@ -3553,6 +3556,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
DeptChangeCheckParam
>
successList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
deptChangeCheckList
.
size
();
i
++)
{
DeptChangeCheckParam
param
=
deptChangeCheckList
.
get
(
i
);
//变更后的项目
String
newDeptNo
=
param
.
getNewDeptNo
();
if
(
StringUtils
.
isBlank
(
newDeptNo
)){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_CHANGE_NOT_EMPTY
);
...
...
@@ -3573,7 +3577,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
errorList
.
add
(
param
);
continue
;
}
//
所属
项目
//
原
项目
String
oldDeptNo
=
param
.
getOldDeptNo
();
if
(
StringUtils
.
isBlank
(
oldDeptNo
)){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_NOT_EMPTY
);
...
...
@@ -3638,7 +3642,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
if
(
MapUtils
.
isEmpty
(
data
)){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_IS_NOT_EXIST
);
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_
CHANGE_
IS_NOT_EXIST
);
errorList
.
add
(
param
);
continue
;
}
else
{
...
...
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