|
|
@ -322,20 +322,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 排序
|
|
|
|
// 排序
|
|
|
|
Comparator<NoteRecordDetailDTO> comparing = Comparator.comparing(NoteRecordDetailDTO::getSerialNumber);
|
|
|
|
noteRecordDetailDTOList.sort((i1,i2)-> (int) ((Double.parseDouble(i1.getSerialNumber())*1000)- (Double.parseDouble(i2.getSerialNumber() )* 1000)));
|
|
|
|
/*if (StrUtil.equals(noteRecord.getOrderBy(),"percentage")){
|
|
|
|
|
|
|
|
comparing = Comparator.comparing(NoteRecordDetailDTO::getRowPercentage);
|
|
|
|
|
|
|
|
if (StrUtil.equalsIgnoreCase(noteRecord.getOrder(),"desc")){
|
|
|
|
|
|
|
|
comparing = comparing.reversed();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StrUtil.equals(noteRecord.getOrderBy(),"name")){
|
|
|
|
|
|
|
|
comparing = Comparator.comparing(NoteRecordDetailDTO::getName);
|
|
|
|
|
|
|
|
if (StrUtil.equalsIgnoreCase(noteRecord.getOrder(),"desc")){
|
|
|
|
|
|
|
|
comparing = comparing.reversed();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
noteRecordDetailDTOList.sort(comparing);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<NoteRecordDetailDTO> pager = ListUtils.Pager(size, page, noteRecordDetailDTOList);
|
|
|
|
List<NoteRecordDetailDTO> pager = ListUtils.Pager(size, page, noteRecordDetailDTOList);
|
|
|
|
return IPages.buildDataMap(pager, noteRecordDetailDTOList.size());
|
|
|
|
return IPages.buildDataMap(pager, noteRecordDetailDTOList.size());
|
|
|
|