Commit 91ef8067 authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent d19f9baa
...@@ -1361,6 +1361,19 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -1361,6 +1361,19 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
return R.failed("电子档案明细不存在"); return R.failed("电子档案明细不存在");
} }
List<TTaskArchiveRelation> relationList = relationService.list(Wrappers.<TTaskArchiveRelation>lambdaQuery()
.eq(TTaskArchiveRelation::getArchiveDetailId, id));
if (Common.isNotNull(relationList)) {
for (TTaskArchiveRelation relation: relationList) {
//查找是否存在任务
TElectronicArchiveTask task = taskService.getById(relation.getTaskId());
if (Common.isNotNull(task) && task.getStatus().equals(ArchiveConstants.TASK_STATUS_NOT_UPLOADED)) {
return R.failed("该明细正在被待上传zip文件的任务使用,请先删除任务或者上传对应的zip文件,"
+ "任务编码:" +task.getTaskCode());
}
}
}
// 2. 查询该明细下所有的附件(包括可用和不可用的) // 2. 查询该明细下所有的附件(包括可用和不可用的)
List<TAttaInfo> attachments = attaInfoService.list(Wrappers.<TAttaInfo>lambdaQuery() List<TAttaInfo> attachments = attaInfoService.list(Wrappers.<TAttaInfo>lambdaQuery()
.eq(TAttaInfo::getDomainId, id) .eq(TAttaInfo::getDomainId, id)
...@@ -1415,7 +1428,6 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -1415,7 +1428,6 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
} }
// 7. 构建返回消息 // 7. 构建返回消息
YifuUser user = SecurityUtils.getUser();
String resultMsg = String.format("删除成功。明细:%s-%s-%s,附件删除成功:%d个", String resultMsg = String.format("删除成功。明细:%s-%s-%s,附件删除成功:%d个",
detail.getDeptNo(), detail.getEmpName(), detail.getEmpIdcard(), attachmentSuccessCount); detail.getDeptNo(), detail.getEmpName(), detail.getEmpIdcard(), attachmentSuccessCount);
......
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