Commit cf69cdb7 authored by suntao's avatar suntao

操作日志排序

parent e2747bb7
......@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
import javax.persistence.criteria.Predicate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
......@@ -48,6 +49,14 @@ public class OptHistoryLogService {
List<OptHistoryLog> userOptHistoryLogList = OrderUtil.convertApplyRequestHistoryList2OptHistoryLogList(applyRequestHistoryList, orderMapping);
userOptHistoryLogList.addAll(optHistoryLogList);
userOptHistoryLogList.sort((o1, o2)->{
if (o1.getCreateTime().getTime() < o2.getCreateTime().getTime()) {
return -1;
} else {
return 1;
}
});
return userOptHistoryLogList;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment