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
084caa06
Commit
084caa06
authored
Jan 09, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-电子档案批量导入第五次提交
parent
d000fdc1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
TElectronicArchiveDetailServiceImpl.java
...tch/service/impl/TElectronicArchiveDetailServiceImpl.java
+6
-3
No files found.
yifu-batch/yifu-batch-biz/src/main/java/com/yifu/cloud/plus/v1/batch/service/impl/TElectronicArchiveDetailServiceImpl.java
View file @
084caa06
...
@@ -273,11 +273,13 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
...
@@ -273,11 +273,13 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
downloadArchiveFiles
(
zipOut
,
folderName
,
downloadInfo
);
downloadArchiveFiles
(
zipOut
,
folderName
,
downloadInfo
);
// 更新反馈状态为成功
// 更新反馈状态为成功
// 使用materialTypeAttaMap的所有key来匹配,确保所有资料类型的反馈都被更新
Set
<
String
>
materialTypes
=
downloadInfo
.
getMaterialTypeAttaMap
().
keySet
();
for
(
ArchiveDownloadFeedbackVO
feedback
:
feedbackList
)
{
for
(
ArchiveDownloadFeedbackVO
feedback
:
feedbackList
)
{
if
(
feedback
.
getEmpName
().
equals
(
downloadInfo
.
getDetail
().
getEmpName
())
&&
if
(
feedback
.
getEmpName
().
equals
(
downloadInfo
.
getDetail
().
getEmpName
())
&&
feedback
.
getEmpIdcard
().
equals
(
downloadInfo
.
getDetail
().
getEmpIdcard
())
&&
feedback
.
getEmpIdcard
().
equals
(
downloadInfo
.
getDetail
().
getEmpIdcard
())
&&
feedback
.
getDeptNo
().
equals
(
downloadInfo
.
getDetail
().
getDeptNo
())
&&
feedback
.
getDeptNo
().
equals
(
downloadInfo
.
getDetail
().
getDeptNo
())
&&
feedback
.
getMaterialType
().
equals
(
downloadInfo
.
getMaterialType
()))
{
materialTypes
.
contains
(
feedback
.
getMaterialType
()))
{
feedback
.
setDownloadStatus
(
"成功"
);
feedback
.
setDownloadStatus
(
"成功"
);
feedback
.
setFailReason
(
""
);
feedback
.
setFailReason
(
""
);
}
}
...
@@ -285,11 +287,12 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
...
@@ -285,11 +287,12 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"下载档案文件失败,文件夹:{}"
,
folderName
,
e
);
log
.
error
(
"下载档案文件失败,文件夹:{}"
,
folderName
,
e
);
// 更新反馈状态为失败
// 更新反馈状态为失败
Set
<
String
>
materialTypes
=
downloadInfo
.
getMaterialTypeAttaMap
().
keySet
();
for
(
ArchiveDownloadFeedbackVO
feedback
:
feedbackList
)
{
for
(
ArchiveDownloadFeedbackVO
feedback
:
feedbackList
)
{
if
(
feedback
.
getEmpName
().
equals
(
downloadInfo
.
getDetail
().
getEmpName
())
&&
if
(
feedback
.
getEmpName
().
equals
(
downloadInfo
.
getDetail
().
getEmpName
())
&&
feedback
.
getEmpIdcard
().
equals
(
downloadInfo
.
getDetail
().
getEmpIdcard
())
&&
feedback
.
getEmpIdcard
().
equals
(
downloadInfo
.
getDetail
().
getEmpIdcard
())
&&
feedback
.
getDeptNo
().
equals
(
downloadInfo
.
getDetail
().
getDeptNo
())
&&
feedback
.
getDeptNo
().
equals
(
downloadInfo
.
getDetail
().
getDeptNo
())
&&
feedback
.
getMaterialType
().
equals
(
downloadInfo
.
getMaterialType
()))
{
materialTypes
.
contains
(
feedback
.
getMaterialType
()))
{
feedback
.
setDownloadStatus
(
"失败"
);
feedback
.
setDownloadStatus
(
"失败"
);
feedback
.
setFailReason
(
"下载文件失败:"
+
e
.
getMessage
());
feedback
.
setFailReason
(
"下载文件失败:"
+
e
.
getMessage
());
}
}
...
@@ -460,7 +463,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
...
@@ -460,7 +463,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
if
(!
downloadInfo
.
getMaterialTypeAttaMap
().
containsKey
(
request
.
getMaterialType
()))
{
if
(!
downloadInfo
.
getMaterialTypeAttaMap
().
containsKey
(
request
.
getMaterialType
()))
{
downloadInfo
.
getMaterialTypeAttaMap
().
put
(
request
.
getMaterialType
(),
attaList
);
downloadInfo
.
getMaterialTypeAttaMap
().
put
(
request
.
getMaterialType
(),
attaList
);
}
}
downloadInfo
.
setMaterialType
(
request
.
getMaterialType
());
// 不再使用单个materialType字段,而是使用materialTypeAttaMap的所有key
// 添加成功的反馈(状态暂时为"处理中",实际下载完成后更新)
// 添加成功的反馈(状态暂时为"处理中",实际下载完成后更新)
feedbackList
.
add
(
createSuccessFeedbackVO
(
request
,
detail
));
feedbackList
.
add
(
createSuccessFeedbackVO
(
request
,
detail
));
...
...
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