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
95c314a4
Commit
95c314a4
authored
Sep 26, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员档案批量更新及新增,排列派单,批量更新预入值 档案地 区县 选填-fxj
parent
65dee890
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-3
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-2
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
95c314a4
...
...
@@ -972,7 +972,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
.
add
(
EmployeeConstants
.
FILE_PROVINCE
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
EmployeeConstants
.
FILE_PROVINCE
));
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getFileTown
()))
{
//2024-09-26 fxj 档案地县选填 MVP1.6.11
if
(
Common
.
isEmpty
(
employeeInfo
.
getFileCity
()))
{
errorMsg
.
add
(
EmployeeConstants
.
FILE_PROVINCE
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
EmployeeConstants
.
FILE_PROVINCE
));
}
...
...
@@ -2008,8 +2009,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 档案地和通信地址 校验
if
(
Common
.
isNotNull
(
headMap
.
get
(
"档案所在省"
))
||
Common
.
isNotNull
(
headMap
.
get
(
"档案所在市"
))
||
Common
.
isNotNull
(
headMap
.
get
(
"档案所在县"
))){
||
Common
.
isNotNull
(
headMap
.
get
(
"档案所在市"
))){
if
(
Common
.
isEmpty
(
excel
.
getFileTown
()))
{
errorMsg
.
add
(
EmployeeConstants
.
FILE_PROVINCE
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
95c314a4
...
...
@@ -2044,8 +2044,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
try
{
employee
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
}
catch
(
Exception
e
)
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"未找到县!"
));
continue
;
//errorMessageList.add(new ErrorMessage<>(excel.getRowIndex(), "未找到县!")); 2024-09-26 mvp1.6.11 预入职档案地区县选填
//continue;
throw
new
RuntimeException
(
"档案地址-区/县转换异常"
);
}
}
tPreEmployeeInfoService
.
updateById
(
employee
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
95c314a4
...
...
@@ -140,7 +140,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 档案-县
*/
@ExcelAttribute
(
name
=
"档案-县"
,
isArea
=
true
,
parentField
=
"fileCity"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"档案-县不能为空"
)
@ExcelAttribute
(
name
=
"档案-县"
,
isArea
=
true
,
parentField
=
"fileCity"
,
isNotEmpty
=
fals
e
,
errorInfo
=
"档案-县不能为空"
)
@Schema
(
description
=
"档案-县"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"档案-县"
)
...
...
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