diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index b13dd512..d79f3beb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -168,9 +168,9 @@ public class ScheduledJob { - - - + /** + * 定时更新文本状态 + */ @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index ee9578a2..4e6217d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -66,9 +66,21 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { @Override public List selectFileByStandId(String standId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID",standId).groupBy("ORI_ATT_ID"); - return sarStandFileEODao.selectList(queryWrapper); + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); + List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + + sarStandFileEOS.forEach(item->{ + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ORI_ATT_ID",item.getOriAttId()) + .eq("USE_MODEL","SOURCE_FILE"); + SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); + item.setFileOldName(sarStandFileEO.getFileName()); + }); + + return sarStandFileEOS; + // return sarStandFileEODao.selectFileByStandId(standId);r }