FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-09-02 16:44:15 +08:00
parent 5fdf3fa9ae 18cda2c469
commit 5c246ba9b4
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+3 -3
View File
@@ -168,9 +168,9 @@ public class ScheduledJob {
/**
* 定时更新文本状态
*/
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?") // @Scheduled(cron="*/5 * * * * ?")
@Async @Async
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+15 -3
View File
@@ -66,9 +66,21 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
@Override @Override
public List<SarStandFileEO> selectFileByStandId(String standId) { public List<SarStandFileEO> selectFileByStandId(String standId) {
QueryWrapper<SarStandFileEO> queryWrapper = new QueryWrapper<>(); QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
queryWrapper.eq("STAND_ID",standId).groupBy("ORI_ATT_ID");
return sarStandFileEODao.selectList(queryWrapper); queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
sarStandFileEOS.forEach(item->{
QueryWrapper<SarStandFileEO> 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 // return sarStandFileEODao.selectFileByStandId(standId);r
} }