diff --git a/src/main/java/com/ann/repository/ArchiveDetailRepository.java b/src/main/java/com/ann/repository/ArchiveDetailRepository.java index b050a9e..6d08c8a 100644 --- a/src/main/java/com/ann/repository/ArchiveDetailRepository.java +++ b/src/main/java/com/ann/repository/ArchiveDetailRepository.java @@ -29,6 +29,8 @@ public interface ArchiveDetailRepository extends JpaRepository type, String masterId); // public String checkExamApply(String masterId) throws Exception; diff --git a/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java b/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java index d5bcf56..893b1a6 100644 --- a/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java +++ b/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java @@ -46,6 +46,11 @@ public class ArchiveDetailServiceImpl implements ArchiveDetailService { return null; } + @Override + public Integer countByMasterIDAndAssortIDAndTitleAndFlag(String masterId, String AssortID,String title) throws Exception { + return archiveDetailRepository.countByMasterIDAndAssortIDAndTitleAndFlag(masterId, AssortID, title); + } + // @Override // public String getTypeNotExits(List type, String masterId) { // return archiveDetailRepository.getTypeNotExits(type, masterId); diff --git a/src/main/java/com/ann/service/impl/QueueService.java b/src/main/java/com/ann/service/impl/QueueService.java index 78fdc2a..1065ff4 100644 --- a/src/main/java/com/ann/service/impl/QueueService.java +++ b/src/main/java/com/ann/service/impl/QueueService.java @@ -44,18 +44,6 @@ public class QueueService { ArchiveDetailService archiveDetailService; @Autowired MessageService messageService; - - public static String deptName; - - @Value("${dept.deptName}") - public void setDeptName(String deptName) { - QueueService.deptName = deptName; - } - - public static String getDeptName() { - return deptName; - } - //---------------------定时器 public void doSomething(List all) throws Exception { if (all.size() > 0) { @@ -221,24 +209,7 @@ public class QueueService { tempPath = messageDto.getDetailType() + "~" + messageDto.getCaptionDateTime() + "~"; } } - File pdfFile =null; - boolean flag=true; - if(deptName.indexOf(",")!=-1){ - String[] deptList=deptName.split(","); - for(int i=0;i1) + { + archiveDetail.setFlag("5"); + } archiveDetailService.save(archiveDetail); //更新messageLog的最后执行时间