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
330329fe
Commit
330329fe
authored
Jan 13, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-电子档案批量导入第五次提交
parent
a2163ce4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
6 deletions
+24
-6
TElectronicArchiveDetailServiceImpl.java
...tch/service/impl/TElectronicArchiveDetailServiceImpl.java
+24
-2
OSSUtil.java
...com/yifu/cloud/plus/v1/yifu/common/core/util/OSSUtil.java
+0
-4
No files found.
yifu-batch/yifu-batch-biz/src/main/java/com/yifu/cloud/plus/v1/batch/service/impl/TElectronicArchiveDetailServiceImpl.java
View file @
330329fe
...
...
@@ -229,10 +229,13 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
}
try
{
//重复数据检测
Map
<
String
,
String
>
map
=
new
HashMap
<>();
// 1. 校验请求并查询档案信息
for
(
ArchiveBatchDownloadRequestVO
request
:
requestList
)
{
try
{
validateAndPrepareDownload
(
request
,
downloadMap
,
feedbackList
,
isCheck
,
deptNoList
);
validateAndPrepareDownload
(
request
,
downloadMap
,
feedbackList
,
isCheck
,
deptNoList
,
map
);
}
catch
(
Exception
e
)
{
log
.
error
(
"处理下载请求失败,姓名:{},身份证:{},项目编码:{}"
,
request
.
getEmpName
(),
request
.
getEmpIdcard
(),
request
.
getDeptNo
(),
e
);
...
...
@@ -345,7 +348,8 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
Map
<
String
,
ArchiveDownloadInfo
>
downloadMap
,
List
<
ArchiveDownloadFeedbackVO
>
feedbackList
,
boolean
isCheck
,
List
<
String
>
deptNoList
)
{
List
<
String
>
deptNoList
,
Map
<
String
,
String
>
map
)
{
// 1. 根据姓名、身份证、项目编码、项目名称查询电子档案明细
LambdaQueryWrapper
<
TElectronicArchiveDetail
>
wrapper
=
Wrappers
.<
TElectronicArchiveDetail
>
lambdaQuery
()
...
...
@@ -362,6 +366,24 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
// 查询档案明细
TElectronicArchiveDetail
detail
=
baseMapper
.
selectOne
(
wrapper
);
StringBuilder
s
=
new
StringBuilder
();
s
.
append
(
request
.
getEmpIdcard
());
s
.
append
(
"_"
);
s
.
append
(
request
.
getDeptNo
());
s
.
append
(
"_"
);
s
.
append
(
request
.
getDeptName
());
s
.
append
(
"_"
);
s
.
append
(
request
.
getEmpName
());
s
.
append
(
"_"
);
s
.
append
(
request
.
getMaterialType
());
if
(
null
!=
map
.
get
(
s
.
toString
()))
{
feedbackList
.
add
(
createFeedbackVO
(
request
,
"存在重复的导出人员信息"
,
detail
));
return
;
}
else
{
map
.
put
(
s
.
toString
(),
"1"
);
}
//项目权限校验
if
(
isCheck
&&
!
deptNoList
.
contains
(
request
.
getDeptNo
()))
{
feedbackList
.
add
(
createFeedbackVO
(
request
,
"没有该项目的权限"
,
detail
));
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/OSSUtil.java
View file @
330329fe
...
...
@@ -241,10 +241,6 @@ public class OSSUtil {
log
.
error
(
"oss客户端获取错误,无此客户端"
,
clientIndex
);
}
else
{
OSSObject
ossObject
=
null
;
// #region agent log
int
fileIndex
=
0
;
long
totalBytesRead
=
0
;
// #endregion
for
(
OSSObjectBean
key:
srcList
){
// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
ossObject
=
client
.
getObject
(
bucketName
,
key
.
getKey
());
...
...
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