diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java index c06ae70..4fe0f18 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java @@ -322,20 +322,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl comparing = Comparator.comparing(NoteRecordDetailDTO::getSerialNumber); - /*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); + noteRecordDetailDTOList.sort((i1,i2)-> (int) ((Double.parseDouble(i1.getSerialNumber())*1000)- (Double.parseDouble(i2.getSerialNumber() )* 1000))); List pager = ListUtils.Pager(size, page, noteRecordDetailDTOList); return IPages.buildDataMap(pager, noteRecordDetailDTOList.size());