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
45b8f701
Commit
45b8f701
authored
Jul 04, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_先删后加
parent
bc6da2ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
64 additions
and
63 deletions
+64
-63
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+64
-63
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
45b8f701
...
@@ -118,6 +118,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -118,6 +118,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
private
final
OSSUtil
ossUtil
;
private
final
OSSUtil
ossUtil
;
private
final
static
String
ID
=
"id"
;
private
final
static
String
ID
=
"id"
;
/**
/**
* 预入职-主表简单分页查询
* 预入职-主表简单分页查询
*
*
...
@@ -146,16 +147,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -146,16 +147,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
String
empId
=
null
;
String
empId
=
null
;
TEmployeeProject
project
;
TEmployeeProject
project
;
PreEmpMainDetailVo
vo
=
new
PreEmpMainDetailVo
();
PreEmpMainDetailVo
vo
=
new
PreEmpMainDetailVo
();
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
YifuUser
user
=
getNewYifuUser
();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
YifuUser
user
=
new
YifuUser
(
"2"
,
1L
,
""
,
"预入职扫码"
,
"预入职扫码"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
true
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
);
if
(
main
!=
null
&&
CommonConstants
.
FIVE_STRING
.
equals
(
main
.
getStatus
()))
{
if
(
main
!=
null
&&
CommonConstants
.
FIVE_STRING
.
equals
(
main
.
getStatus
()))
{
// 清空信息
// 清空信息
if
(
Common
.
isNotNull
(
main
.
getId
()))
{
if
(
Common
.
isNotNull
(
main
.
getId
()))
{
...
@@ -779,6 +771,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -779,6 +771,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
saveBase
(
vo
,
CommonConstants
.
ONE_STRING
);
return
saveBase
(
vo
,
CommonConstants
.
ONE_STRING
);
}
}
/**
/**
* @Description: 核心保存
* @Description: 核心保存
* @Author: hgw
* @Author: hgw
...
@@ -786,16 +779,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -786,16 +779,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
private
R
<
String
>
saveBase
(
PreEmpMainDetailVo
vo
,
String
status
)
{
private
R
<
String
>
saveBase
(
PreEmpMainDetailVo
vo
,
String
status
)
{
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
YifuUser
user
=
getNewYifuUser
();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
YifuUser
user
=
new
YifuUser
(
"2"
,
1L
,
""
,
"预入职扫码"
,
"预入职扫码"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
true
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
);
TPreEmpMain
main
=
vo
.
getMain
();
TPreEmpMain
main
=
vo
.
getMain
();
if
(
main
!=
null
&&
Common
.
isNotNull
(
main
.
getEmpIdcard
()))
{
if
(
main
!=
null
&&
Common
.
isNotNull
(
main
.
getEmpIdcard
()))
{
TPreEmployeeProject
tPreEmployeeProject
=
vo
.
getTpreEmployeeProject
();
TPreEmployeeProject
tPreEmployeeProject
=
vo
.
getTpreEmployeeProject
();
...
@@ -975,6 +959,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -975,6 +959,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
}
}
private
YifuUser
getNewYifuUser
()
{
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
YifuUser
user
=
new
YifuUser
(
"2"
,
1L
,
""
,
"预入职扫码"
,
"预入职扫码"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
true
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
);
return
user
;
}
/**
/**
* @Description: 执行复制到档案的操作
* @Description: 执行复制到档案的操作
* @Author: hgw
* @Author: hgw
...
@@ -983,6 +981,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -983,6 +981,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
**/
**/
private
R
<
String
>
updateToEmployeeByPre
(
PreEmpMainDetailVo
vo
)
{
private
R
<
String
>
updateToEmployeeByPre
(
PreEmpMainDetailVo
vo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
)
{
user
=
getNewYifuUser
();
}
// 预入职-人员档案表
// 预入职-人员档案表
TPreEmployeeInfo
tPreEmployeeInfo
=
vo
.
getTpreEmployeeInfo
();
TPreEmployeeInfo
tPreEmployeeInfo
=
vo
.
getTpreEmployeeInfo
();
// 预入职-项目档案表
// 预入职-项目档案表
...
@@ -2046,15 +2047,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2046,15 +2047,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
int
endRow9
=
0
;
int
endRow9
=
0
;
for
(
int
j
=
1
;
j
<
list
.
size
()
-
1
;
j
++)
{
for
(
int
j
=
1
;
j
<
list
.
size
()
-
1
;
j
++)
{
// 0状态
// 0状态
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField1
())
&&
list
.
get
(
j
).
getField1
().
equals
(
list
.
get
(
j
-
1
).
getField1
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField1
())
&&
list
.
get
(
j
).
getField1
().
equals
(
list
.
get
(
j
-
1
).
getField1
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField1
())
&&
list
.
get
(
j
).
getField1
().
equals
(
list
.
get
(
j
+
1
).
getField1
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField1
())
&&
list
.
get
(
j
).
getField1
().
equals
(
list
.
get
(
j
+
1
).
getField1
()));
if
(
preBoo
&&
startRow0
==
0
)
{
if
(
preBoo
&&
startRow0
==
0
)
{
startRow0
=
1
+
j
;
startRow0
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow0
>
0
)
{
if
(!
afterBoo
&&
startRow0
>
0
)
{
endRow0
=
2
+
j
;
endRow0
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow0
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow0
>
0
)
{
endRow0
=
3
+
j
;
endRow0
=
3
+
j
;
}
}
if
(
startRow0
>
0
&&
endRow0
>
0
)
{
if
(
startRow0
>
0
&&
endRow0
>
0
)
{
...
@@ -2064,15 +2065,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2064,15 +2065,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow0
=
0
;
endRow0
=
0
;
}
}
// 1提交时间
// 1提交时间
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField2
())
&&
list
.
get
(
j
).
getField2
().
equals
(
list
.
get
(
j
-
1
).
getField2
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField2
())
&&
list
.
get
(
j
).
getField2
().
equals
(
list
.
get
(
j
-
1
).
getField2
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField2
())
&&
list
.
get
(
j
).
getField2
().
equals
(
list
.
get
(
j
+
1
).
getField2
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField2
())
&&
list
.
get
(
j
).
getField2
().
equals
(
list
.
get
(
j
+
1
).
getField2
()));
if
(
preBoo
&&
startRow1
==
0
)
{
if
(
preBoo
&&
startRow1
==
0
)
{
startRow1
=
1
+
j
;
startRow1
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow1
>
0
)
{
if
(!
afterBoo
&&
startRow1
>
0
)
{
endRow1
=
2
+
j
;
endRow1
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow1
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow1
>
0
)
{
endRow1
=
3
+
j
;
endRow1
=
3
+
j
;
}
}
if
(
startRow1
>
0
&&
endRow1
>
0
)
{
if
(
startRow1
>
0
&&
endRow1
>
0
)
{
...
@@ -2082,8 +2083,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2082,8 +2083,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow1
=
0
;
endRow1
=
0
;
}
}
// 1员工基本信息-身份证
// 1员工基本信息-身份证
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()));
if
(
startRow
==
0
)
{
if
(
startRow
==
0
)
{
if
(
preBoo
)
{
if
(
preBoo
)
{
startRow
=
1
+
j
;
startRow
=
1
+
j
;
...
@@ -2094,7 +2095,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2094,7 +2095,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(!
afterBoo
&&
startRow
>
0
)
{
if
(!
afterBoo
&&
startRow
>
0
)
{
endRow
=
2
+
j
;
endRow
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow
>
0
)
{
endRow
=
3
+
j
;
endRow
=
3
+
j
;
}
}
if
(
startRow
>
0
&&
endRow
>
0
)
{
if
(
startRow
>
0
&&
endRow
>
0
)
{
...
@@ -2106,8 +2107,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2106,8 +2107,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow
=
0
;
endRow
=
0
;
}
}
// 2在项信息-项目名称
// 2在项信息-项目名称
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField24
())
&&
list
.
get
(
j
).
getField24
().
equals
(
list
.
get
(
j
-
1
).
getField24
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField24
())
&&
list
.
get
(
j
).
getField24
().
equals
(
list
.
get
(
j
-
1
).
getField24
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField24
())
&&
list
.
get
(
j
).
getField24
().
equals
(
list
.
get
(
j
+
1
).
getField24
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField24
())
&&
list
.
get
(
j
).
getField24
().
equals
(
list
.
get
(
j
+
1
).
getField24
()));
if
(
startRow2
==
0
)
{
if
(
startRow2
==
0
)
{
if
(
preBoo
)
{
if
(
preBoo
)
{
startRow2
=
1
+
j
;
startRow2
=
1
+
j
;
...
@@ -2118,7 +2119,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2118,7 +2119,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(!
afterBoo
&&
startRow2
>
0
)
{
if
(!
afterBoo
&&
startRow2
>
0
)
{
endRow2
=
2
+
j
;
endRow2
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow2
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow2
>
0
)
{
endRow2
=
3
+
j
;
endRow2
=
3
+
j
;
}
}
if
(
startRow2
>
0
&&
endRow2
>
0
)
{
if
(
startRow2
>
0
&&
endRow2
>
0
)
{
...
@@ -2130,8 +2131,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2130,8 +2131,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow2
=
0
;
endRow2
=
0
;
}
}
// 3紧急联络人-姓名
// 3紧急联络人-姓名
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField32
())
&&
list
.
get
(
j
).
getField32
().
equals
(
list
.
get
(
j
-
1
).
getField32
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField32
())
&&
list
.
get
(
j
).
getField32
().
equals
(
list
.
get
(
j
-
1
).
getField32
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField32
())
&&
list
.
get
(
j
).
getField32
().
equals
(
list
.
get
(
j
+
1
).
getField32
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField32
())
&&
list
.
get
(
j
).
getField32
().
equals
(
list
.
get
(
j
+
1
).
getField32
()));
if
(
startRow3
==
0
)
{
if
(
startRow3
==
0
)
{
if
(
preBoo
)
{
if
(
preBoo
)
{
startRow3
=
1
+
j
;
startRow3
=
1
+
j
;
...
@@ -2142,7 +2143,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2142,7 +2143,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(!
afterBoo
&&
startRow3
>
0
)
{
if
(!
afterBoo
&&
startRow3
>
0
)
{
endRow3
=
2
+
j
;
endRow3
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow3
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow3
>
0
)
{
endRow3
=
3
+
j
;
endRow3
=
3
+
j
;
}
}
if
(
startRow3
>
0
&&
endRow3
>
0
)
{
if
(
startRow3
>
0
&&
endRow3
>
0
)
{
...
@@ -2154,15 +2155,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2154,15 +2155,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow3
=
0
;
endRow3
=
0
;
}
}
// 4最高教育经历-专业
// 4最高教育经历-专业
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField37
())
&&
list
.
get
(
j
).
getField37
().
equals
(
list
.
get
(
j
-
1
).
getField37
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField37
())
&&
list
.
get
(
j
).
getField37
().
equals
(
list
.
get
(
j
-
1
).
getField37
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField37
())
&&
list
.
get
(
j
).
getField37
().
equals
(
list
.
get
(
j
+
1
).
getField37
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField37
())
&&
list
.
get
(
j
).
getField37
().
equals
(
list
.
get
(
j
+
1
).
getField37
()));
if
(
preBoo
&&
startRow4
==
0
)
{
if
(
preBoo
&&
startRow4
==
0
)
{
startRow4
=
1
+
j
;
startRow4
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow4
>
0
)
{
if
(!
afterBoo
&&
startRow4
>
0
)
{
endRow4
=
2
+
j
;
endRow4
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow4
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow4
>
0
)
{
endRow4
=
3
+
j
;
endRow4
=
3
+
j
;
}
}
if
(
startRow4
>
0
&&
endRow4
>
0
)
{
if
(
startRow4
>
0
&&
endRow4
>
0
)
{
...
@@ -2174,15 +2175,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2174,15 +2175,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow4
=
0
;
endRow4
=
0
;
}
}
// 5主要工作经历-专业
// 5主要工作经历-专业
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField44
())
&&
list
.
get
(
j
).
getField44
().
equals
(
list
.
get
(
j
-
1
).
getField44
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField44
())
&&
list
.
get
(
j
).
getField44
().
equals
(
list
.
get
(
j
-
1
).
getField44
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField44
())
&&
list
.
get
(
j
).
getField44
().
equals
(
list
.
get
(
j
+
1
).
getField44
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField44
())
&&
list
.
get
(
j
).
getField44
().
equals
(
list
.
get
(
j
+
1
).
getField44
()));
if
(
preBoo
&&
startRow5
==
0
)
{
if
(
preBoo
&&
startRow5
==
0
)
{
startRow5
=
1
+
j
;
startRow5
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow5
>
0
)
{
if
(!
afterBoo
&&
startRow5
>
0
)
{
endRow5
=
2
+
j
;
endRow5
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow5
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow5
>
0
)
{
endRow5
=
3
+
j
;
endRow5
=
3
+
j
;
}
}
if
(
startRow5
>
0
&&
endRow5
>
0
)
{
if
(
startRow5
>
0
&&
endRow5
>
0
)
{
...
@@ -2194,15 +2195,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2194,15 +2195,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow5
=
0
;
endRow5
=
0
;
}
}
// 6主要家庭成员信息-成员姓名
// 6主要家庭成员信息-成员姓名
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField47
())
&&
list
.
get
(
j
).
getField47
().
equals
(
list
.
get
(
j
-
1
).
getField47
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField47
())
&&
list
.
get
(
j
).
getField47
().
equals
(
list
.
get
(
j
-
1
).
getField47
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField47
())
&&
list
.
get
(
j
).
getField47
().
equals
(
list
.
get
(
j
+
1
).
getField47
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField47
())
&&
list
.
get
(
j
).
getField47
().
equals
(
list
.
get
(
j
+
1
).
getField47
()));
if
(
preBoo
&&
startRow6
==
0
)
{
if
(
preBoo
&&
startRow6
==
0
)
{
startRow6
=
1
+
j
;
startRow6
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow6
>
0
)
{
if
(!
afterBoo
&&
startRow6
>
0
)
{
endRow6
=
2
+
j
;
endRow6
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow6
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow6
>
0
)
{
endRow6
=
3
+
j
;
endRow6
=
3
+
j
;
}
}
if
(
startRow6
>
0
&&
endRow6
>
0
)
{
if
(
startRow6
>
0
&&
endRow6
>
0
)
{
...
@@ -2214,15 +2215,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2214,15 +2215,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow6
=
0
;
endRow6
=
0
;
}
}
// 7职业资格信息-职业资格名称
// 7职业资格信息-职业资格名称
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField53
())
&&
list
.
get
(
j
).
getField53
().
equals
(
list
.
get
(
j
-
1
).
getField53
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField53
())
&&
list
.
get
(
j
).
getField53
().
equals
(
list
.
get
(
j
-
1
).
getField53
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField53
())
&&
list
.
get
(
j
).
getField53
().
equals
(
list
.
get
(
j
+
1
).
getField53
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField53
())
&&
list
.
get
(
j
).
getField53
().
equals
(
list
.
get
(
j
+
1
).
getField53
()));
if
(
preBoo
&&
startRow7
==
0
)
{
if
(
preBoo
&&
startRow7
==
0
)
{
startRow7
=
1
+
j
;
startRow7
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow7
>
0
)
{
if
(!
afterBoo
&&
startRow7
>
0
)
{
endRow7
=
2
+
j
;
endRow7
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow7
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow7
>
0
)
{
endRow7
=
3
+
j
;
endRow7
=
3
+
j
;
}
}
if
(
startRow7
>
0
&&
endRow7
>
0
)
{
if
(
startRow7
>
0
&&
endRow7
>
0
)
{
...
@@ -2234,19 +2235,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2234,19 +2235,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow7
=
0
;
endRow7
=
0
;
}
}
// 8伤残信息-职业资格名称+传染病名称+伤残病名称
// 8伤残信息-职业资格名称+传染病名称+伤残病名称
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField56
())
&&
list
.
get
(
j
).
getField56
().
equals
(
list
.
get
(
j
-
1
).
getField56
()))
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField56
())
&&
list
.
get
(
j
).
getField56
().
equals
(
list
.
get
(
j
-
1
).
getField56
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField58
())
&&
list
.
get
(
j
).
getField58
().
equals
(
list
.
get
(
j
-
1
).
getField58
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField58
())
&&
list
.
get
(
j
).
getField58
().
equals
(
list
.
get
(
j
-
1
).
getField58
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField60
())
&&
list
.
get
(
j
).
getField60
().
equals
(
list
.
get
(
j
-
1
).
getField60
()));
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField60
())
&&
list
.
get
(
j
).
getField60
().
equals
(
list
.
get
(
j
-
1
).
getField60
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField56
())
&&
list
.
get
(
j
).
getField56
().
equals
(
list
.
get
(
j
+
1
).
getField56
()))
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField56
())
&&
list
.
get
(
j
).
getField56
().
equals
(
list
.
get
(
j
+
1
).
getField56
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField58
())
&&
list
.
get
(
j
).
getField58
().
equals
(
list
.
get
(
j
+
1
).
getField58
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField58
())
&&
list
.
get
(
j
).
getField58
().
equals
(
list
.
get
(
j
+
1
).
getField58
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField60
())
&&
list
.
get
(
j
).
getField60
().
equals
(
list
.
get
(
j
+
1
).
getField60
()));
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField60
())
&&
list
.
get
(
j
).
getField60
().
equals
(
list
.
get
(
j
+
1
).
getField60
()));
if
(
preBoo
&&
startRow8
==
0
)
{
if
(
preBoo
&&
startRow8
==
0
)
{
startRow8
=
1
+
j
;
startRow8
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow8
>
0
)
{
if
(!
afterBoo
&&
startRow8
>
0
)
{
endRow8
=
2
+
j
;
endRow8
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow8
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow8
>
0
)
{
endRow8
=
3
+
j
;
endRow8
=
3
+
j
;
}
}
if
(
startRow8
>
0
&&
endRow8
>
0
)
{
if
(
startRow8
>
0
&&
endRow8
>
0
)
{
...
@@ -2258,15 +2259,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2258,15 +2259,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
endRow8
=
0
;
endRow8
=
0
;
}
}
// 9不良记录
// 9不良记录
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField63
())
&&
list
.
get
(
j
).
getField63
().
equals
(
list
.
get
(
j
-
1
).
getField63
()));
preBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
-
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField63
())
&&
list
.
get
(
j
).
getField63
().
equals
(
list
.
get
(
j
-
1
).
getField63
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField63
())
&&
list
.
get
(
j
).
getField63
().
equals
(
list
.
get
(
j
+
1
).
getField63
()));
afterBoo
=
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField6
())
&&
list
.
get
(
j
).
getField6
().
equals
(
list
.
get
(
j
+
1
).
getField6
()))
&&
(
Common
.
isNotNull
(
list
.
get
(
j
).
getField63
())
&&
list
.
get
(
j
).
getField63
().
equals
(
list
.
get
(
j
+
1
).
getField63
()));
if
(
preBoo
&&
startRow9
==
0
)
{
if
(
preBoo
&&
startRow9
==
0
)
{
startRow9
=
1
+
j
;
startRow9
=
1
+
j
;
}
}
if
(!
afterBoo
&&
startRow9
>
0
)
{
if
(!
afterBoo
&&
startRow9
>
0
)
{
endRow9
=
2
+
j
;
endRow9
=
2
+
j
;
}
}
if
(
j
==
list
.
size
()
-
2
&&
startRow9
>
0
)
{
if
(
j
==
list
.
size
()
-
2
&&
startRow9
>
0
)
{
endRow9
=
3
+
j
;
endRow9
=
3
+
j
;
}
}
if
(
startRow9
>
0
&&
endRow9
>
0
)
{
if
(
startRow9
>
0
&&
endRow9
>
0
)
{
...
...
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