Commit 30b1912b authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第五次提交

parent 084caa06
......@@ -279,7 +279,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
if (feedback.getEmpName().equals(downloadInfo.getDetail().getEmpName()) &&
feedback.getEmpIdcard().equals(downloadInfo.getDetail().getEmpIdcard()) &&
feedback.getDeptNo().equals(downloadInfo.getDetail().getDeptNo()) &&
materialTypes.contains(feedback.getMaterialType())) {
(materialTypes.contains(feedback.getMaterialType()) || "全部资料类型".equals(feedback.getMaterialType()))) {
feedback.setDownloadStatus("成功");
feedback.setFailReason("");
}
......@@ -292,7 +292,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
if (feedback.getEmpName().equals(downloadInfo.getDetail().getEmpName()) &&
feedback.getEmpIdcard().equals(downloadInfo.getDetail().getEmpIdcard()) &&
feedback.getDeptNo().equals(downloadInfo.getDetail().getDeptNo()) &&
materialTypes.contains(feedback.getMaterialType())) {
(materialTypes.contains(feedback.getMaterialType()) || "全部资料类型".equals(feedback.getMaterialType()))) {
feedback.setDownloadStatus("失败");
feedback.setFailReason("下载文件失败:" + e.getMessage());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment