|
@@ -629,11 +629,28 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
|
|
|
@Override
|
|
|
public CheckJobVO getDetail(Object id) {
|
|
|
CheckJobVO vo = mapper.selectDetail(id);
|
|
|
+
|
|
|
+ Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
|
|
|
+ weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getStandardId());
|
|
|
+ List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
|
|
|
+ List<SysFile> checkImgList = ListUtils.newArrayList();
|
|
|
+ List<SysFile> checkFileList = ListUtils.newArrayList();
|
|
|
+ sysFiles.forEach(item -> {
|
|
|
+ if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue())) {
|
|
|
+ checkImgList.add(item);
|
|
|
+ }
|
|
|
+ if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_FILES.getValue())) {
|
|
|
+ checkFileList.add(item);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ vo.setCheckImgList(checkImgList);
|
|
|
+ vo.setCheckFileList(checkFileList);
|
|
|
+
|
|
|
Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
|
|
|
weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getId());
|
|
|
- List<SysFile> sysFiles = sysFileMapper.selectByExample(weekend);
|
|
|
+ List<SysFile> sysFiles2 = sysFileMapper.selectByExample(weekend);
|
|
|
List<SysFile> sbFileList = ListUtils.newArrayList();
|
|
|
- sysFiles.forEach(item -> {
|
|
|
+ sysFiles2.forEach(item -> {
|
|
|
if (item.getType().equals( SysFileTypeEnum.CHECK_JOB_FILES.getValue())) {
|
|
|
sbFileList.add(item);
|
|
|
}
|