diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1f234692..d85fc975 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1056,7 +1056,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 34fd22d0..84fb82be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -398,7 +398,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 031bf5b6..686a137c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -627,7 +627,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldList.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); + List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 15a17852..60f7922a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -22,6 +22,8 @@ public interface IAttFileEOService extends IService { public List getMultiFileInfos(String fileIds); + public List getMultiFileInfosOrderByDateDesc(String fileIds); + public String saveFileAttId(File file); public AttFileVo insertFileInfo(File file,String fileName); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index ce08c19c..ab4bc7c9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -332,6 +333,39 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileEO; } + /** + * @Author super_liu + * @Description 多文件查询 + * Date 2018/10/24 11:08 + * @Param [fileIds] + * @return java.util.List + **/ + public List getMultiFileInfosOrderByDateDesc(String fileIds) { + List fileObj = new ArrayList<>(); + if(StringUtils.isNotEmpty(fileIds)){ + String idList[] = fileIds.split(","); + for(int i=0;i