|
|
|
@ -64,7 +64,7 @@ public class SzyReportManagerServiceImpl implements ReportManagerService {
|
|
|
|
|
task.setSysflag(sysFlag);
|
|
|
|
|
List<AfCollectTask> tasks = collectTaskMapper.getTasks(task);
|
|
|
|
|
if (Func.isEmpty(tasks)) {
|
|
|
|
|
throw new BaseException("无纸化系统没有可作废的电生理报告:" + reportNo);
|
|
|
|
|
throw new BaseException("无纸化系统没有可作废的电生理报告任务:" + reportNo);
|
|
|
|
|
}
|
|
|
|
|
ArrayList<Long> taskIds = new ArrayList<>();
|
|
|
|
|
ArrayList<Long> scanAssortIds = new ArrayList<>();
|
|
|
|
@ -80,8 +80,12 @@ public class SzyReportManagerServiceImpl implements ReportManagerService {
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void cancelReportTaskAndFile(List<Long> taskIds, List<Long> scanAssortIds) {
|
|
|
|
|
collectTaskMapper.cancel(taskIds);
|
|
|
|
|
scanAssortMapper.cancel(scanAssortIds);
|
|
|
|
|
if (Func.isNotEmpty(taskIds)) {
|
|
|
|
|
collectTaskMapper.cancel(taskIds);
|
|
|
|
|
}
|
|
|
|
|
if (Func.isNotEmpty(scanAssortIds)) {
|
|
|
|
|
scanAssortMapper.cancel(scanAssortIds);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String error(String msg) {
|
|
|
|
|