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
82db8910
Commit
82db8910
authored
Oct 18, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 批量更新档案
parent
310231d9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+4
-0
PreUploadEmpImportVo.java
.../cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
+4
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-3
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
82db8910
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -195,6 +196,9 @@ public class PreUploadEmpImportTwoVo implements Serializable {
private
Date
validityEndValue
;
// 字典值结束
@TableField
(
exist
=
false
)
private
int
lineNum
;
@TableField
(
exist
=
false
)
private
String
errorInfo
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
View file @
82db8910
...
...
@@ -301,6 +301,10 @@ public class PreUploadEmpImportVo implements Serializable {
@TableField
(
exist
=
false
)
private
Boolean
isMain
;
@TableField
(
exist
=
false
)
private
int
lineNum
;
@TableField
(
exist
=
false
)
private
String
errorInfo
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
82db8910
...
...
@@ -3307,6 +3307,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
List
<
String
>
phoneList
=
new
ArrayList
<>();
String
errorCurInfo
=
"该项目下无此员工,请核实"
;
String
errorCurInfoStatus
=
"该人员档案状态未在档,请核实"
;
int
lineNum
=
2
;
for
(
Map
<
String
,
String
>
rowMap
:
vo
.
getContentList
())
{
curVo
=
null
;
errorMust
=
new
StringBuilder
();
...
...
@@ -3315,6 +3316,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 每一行都要初始化起始时间
startDateMap
=
new
HashMap
<>();
detail
=
new
PreUploadEmpImportTwoVo
();
detail
.
setLineNum
(
lineNum
++);
for
(
int
i
=
0
;
i
<
modelLength
;
i
++)
{
shuName
=
titleMap
.
get
(
i
);
shuValue
=
rowMap
.
get
(
String
.
valueOf
(
i
));
...
...
@@ -3388,8 +3390,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 2格式不正确:在循环里已经判断了
// 3校验是否通过:姓名&身份证号是否一致、手机号是否真实、姓名&银行卡号是否一致
if
(
Common
.
isNotNull
(
detail
.
get
EmpName
()))
{
if
(
Common
.
isNotNull
(
detail
.
get
BankNo
()))
{
if
(
Common
.
isNotNull
(
detail
.
get
BankNo
()))
{
if
(
Common
.
isNotNull
(
detail
.
get
EmpName
()))
{
bankCheck
=
new
TCheckBankNo
();
bankCheck
.
setBankNo
(
detail
.
getBankNo
());
bankCheck
.
setName
(
detail
.
getEmpName
());
...
...
@@ -3718,7 +3720,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
//数据保存
return
R
.
ok
();
}
else
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"含失败的全部数据:"
,
errorList
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
null
,
errorList
);
}
}
else
{
return
R
.
failed
(
"未识别到表格内容行!请检查表格!"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
82db8910
...
...
@@ -2710,6 +2710,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 存放父级area的值
Map
<
String
,
String
>
parentAreaMap
=
new
HashMap
<>();
Map
<
String
,
Date
>
startDateMap
;
int
lineNum
=
2
;
for
(
Map
<
String
,
String
>
rowMap
:
vo
.
getContentList
())
{
curVo
=
null
;
errorMust
=
new
StringBuilder
();
...
...
@@ -2717,6 +2718,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 每一行都要初始化起始时间
startDateMap
=
new
HashMap
<>();
detail
=
new
PreUploadEmpImportVo
();
detail
.
setLineNum
(
lineNum
++);
for
(
int
i
=
0
;
i
<
modelLength
;
i
++)
{
shuName
=
titleMap
.
get
(
i
);
shuValue
=
rowMap
.
get
(
String
.
valueOf
(
i
));
...
...
@@ -3374,7 +3376,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
if
(!
errorList
.
isEmpty
())
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"失败数据:"
,
errorList
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
null
,
errorList
);
}
else
{
//数据保存
return
R
.
ok
();
...
...
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