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
9d48d3c0
Commit
9d48d3c0
authored
Feb 14, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.6-优化档案省市县联动导入的问题
parent
c7dc2161
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
29 deletions
+31
-29
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+31
-29
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
9d48d3c0
...
...
@@ -1515,23 +1515,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
else
{
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
}
}
// 档案所在地
if
(
Common
.
isNotNull
(
excel
.
getFileProvince
()))
{
saveEmp
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
...
...
@@ -2046,23 +2047,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
else
{
saveEmp
.
setIdProvince
(
Integer
.
parseInt
(
areaStr
));
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
}
}
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()
))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
(
));
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()
));
}
else
{
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
if
(
Common
.
isNotNull
(
excel
.
getIdCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdProvince
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
.
setIdCity
(
Integer
.
parseInt
(
areaStr
));
}
if
(
Common
.
isNotNull
(
excel
.
getIdTown
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
excel
.
getIdTown
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getIdCity
().
trim
());
if
(
Common
.
isEmpty
(
areaStr
))
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_AREA_ERROR
,
excel
.
getEmpIdcard
()
));
}
else
{
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
saveEmp
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
...
...
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