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
4f49f53e
Commit
4f49f53e
authored
Nov 29, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等
parent
07e75bdb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+10
-5
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
4f49f53e
...
...
@@ -1295,7 +1295,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 处理档案状态
if
(
CollectionUtils
.
isNotEmpty
(
successList
))
{
this
.
doFailInfo
(
successList
,
sourceIdCardList
,
replaceIdList
,
CommonConstants
.
FOUR
_STRING
);
this
.
doFailInfo
(
successList
,
sourceIdCardList
,
replaceIdList
,
CommonConstants
.
ZERO
_STRING
);
}
}
//操作记录
...
...
@@ -1578,18 +1578,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
proStatus
=
proStatusMap
.
get
(
detail
.
getEmpIdcardNo
()
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getDeptId
());
empStatus
=
empStatusMap
.
get
(
detail
.
getEmpIdcardNo
());
// 判断该项目的商险的状态 2正常>3处理中>4失效>0无商险
// 判断该项目的商险的状态 2正常>4处理中>3失效>0无商险
// 0无2正常3失效4处理中
status
=
this
.
judgeStatus
(
detail
);
if
(
proStatus
!=
null
)
{
if
(
status
!=
0
&&
status
<
proStatus
)
{
proStatus
=
status
;
if
(
proStatus
!=
CommonConstants
.
TWO_INT
&&
(
status
==
CommonConstants
.
TWO_INT
||
status
==
CommonConstants
.
FOUR_INT
||
(
status
==
CommonConstants
.
THREE_INT
&&
proStatus
!=
CommonConstants
.
FOUR_INT
)))
{
proStatus
=
status
;
}
}
else
{
proStatus
=
status
;
}
if
(
empStatus
!=
null
)
{
if
(
status
!=
0
&&
status
<
empStatus
)
{
if
(
empStatus
!=
CommonConstants
.
TWO_INT
&&
(
status
==
CommonConstants
.
TWO_INT
||
status
==
CommonConstants
.
FOUR_INT
||
(
status
==
CommonConstants
.
THREE_INT
&&
empStatus
!=
CommonConstants
.
FOUR_INT
)))
{
empStatus
=
status
;
}
}
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