aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-05 14:20:27 +08:00
parent 42c1660377
commit b264aae2e2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -2453,12 +2453,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
if(!CollectionUtil.isEmpty(transferList)){ if(!CollectionUtil.isEmpty(transferList)){
listTraces.addAll(transferList); listTraces.addAll(transferList);
}
if(!CollectionUtil.isEmpty(listTraces)) {
//按时间从最最近排序 //按时间从最最近排序
Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>(){ Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>() {
@Override @Override
public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) { public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) {
if(isAsc) { if (isAsc) {
if (a.getScanDate().after(b.getScanDate())) { if (a.getScanDate().after(b.getScanDate())) {
return -1; return -1;
} else if (a.getScanDate().before(b.getScanDate())) { } else if (a.getScanDate().before(b.getScanDate())) {
@ -2466,7 +2468,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
} else { } else {
return 0; return 0;
} }
}else{ } else {
if (a.getScanDate().after(b.getScanDate())) { if (a.getScanDate().after(b.getScanDate())) {
return 1; return 1;
} else if (a.getScanDate().before(b.getScanDate())) { } else if (a.getScanDate().before(b.getScanDate())) {
@ -2477,8 +2479,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
} }
} }
}); });
} }
log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces)); log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
return listTraces; return listTraces;
} }