|
@@ -455,6 +455,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
List<SysFile> sysFiles = sysFileService.getListByTargetAndType(id, null);
|
|
|
List<SysFile> imageList = ListUtils.newArrayList();
|
|
|
List<SysFile> fileList = ListUtils.newArrayList();
|
|
|
+ List<SysFile> applyImageList = ListUtils.newArrayList();
|
|
|
+ List<SysFile> applyFileList = ListUtils.newArrayList();
|
|
|
sysFiles.forEach(item -> {
|
|
|
if (item.getType().equals(SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue())) {
|
|
|
imageList.add(item);
|
|
@@ -462,9 +464,17 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
if (item.getType().equals(SysFileTypeEnum.PREPARATION_APPLICATION_FILES.getValue())) {
|
|
|
fileList.add(item);
|
|
|
}
|
|
|
+ if (item.getType().equals(SysFileTypeEnum.PREPARATION_APPLICATION_IMGS_APPLY.getValue())) {
|
|
|
+ applyImageList.add(item);
|
|
|
+ }
|
|
|
+ if (item.getType().equals(SysFileTypeEnum.PREPARATION_APPLICATION_FILES_APPLY.getValue())) {
|
|
|
+ applyFileList.add(item);
|
|
|
+ }
|
|
|
});
|
|
|
vo.setImageList(imageList);
|
|
|
vo.setFileList(fileList);
|
|
|
+ vo.setApplyImageList(applyImageList);
|
|
|
+ vo.setApplyFileList(applyFileList);
|
|
|
// 审批主管
|
|
|
if (!StringUtils.isEmpty(vo.getApplyVerifyUserId())) {
|
|
|
vo.setApplyVerifyUser(sysUserMapper.selectUserNameById(vo.getApplyVerifyUserId()));
|