|
|
@ -265,10 +265,10 @@ public class QueueService {
|
|
|
|
archiveDetail.setPdfPath(pdfPath);
|
|
|
|
archiveDetail.setPdfPath(pdfPath);
|
|
|
|
int i=archiveDetailService.countByMasterIDAndAssortIDAndTitleAndFlag(archiveDetail.getMasterID(),archiveDetail.getAssortID(),archiveDetail.getTitle());
|
|
|
|
int i=archiveDetailService.countByMasterIDAndAssortIDAndTitleAndFlag(archiveDetail.getMasterID(),archiveDetail.getAssortID(),archiveDetail.getTitle());
|
|
|
|
//如果detail表有重复的分段数据,则把falg改为5(5为没人使用的自定义数字),同时修改修改完整性接口的sql
|
|
|
|
//如果detail表有重复的分段数据,则把falg改为5(5为没人使用的自定义数字),同时修改修改完整性接口的sql
|
|
|
|
if(archiveDetailService.countByMasterIDAndAssortIDAndTitleAndFlag(archiveDetail.getMasterID(),archiveDetail.getAssortID(),archiveDetail.getTitle())>1)
|
|
|
|
// if(archiveDetailService.countByMasterIDAndAssortIDAndTitleAndFlag(archiveDetail.getMasterID(),archiveDetail.getAssortID(),archiveDetail.getTitle())>1)
|
|
|
|
{
|
|
|
|
// {
|
|
|
|
archiveDetail.setFlag("5");
|
|
|
|
// archiveDetail.setFlag("5");
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
archiveDetailService.save(archiveDetail);
|
|
|
|
archiveDetailService.save(archiveDetail);
|
|
|
|
|
|
|
|
|
|
|
|
//更新messageLog的最后执行时间
|
|
|
|
//更新messageLog的最后执行时间
|
|
|
@ -413,4 +413,4 @@ public class QueueService {
|
|
|
|
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
|
|
|
|
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
|
|
|
|
return pattern.matcher(str).matches();
|
|
|
|
return pattern.matcher(str).matches();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|