|
|
|
@ -147,16 +147,16 @@ public class InvProductController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//根据单据日期排序
|
|
|
|
|
list.sort((o1, o2) -> {
|
|
|
|
|
long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
|
|
|
|
|
long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
|
|
|
|
|
if (o1OrderTime > o2OrderTime) {
|
|
|
|
|
return 1;
|
|
|
|
|
} else if (o1OrderTime < o2OrderTime) {
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
});
|
|
|
|
|
// list.sort((o1, o2) -> {
|
|
|
|
|
// long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
|
|
|
|
|
// long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
|
|
|
|
|
// if (o1OrderTime > o2OrderTime) {
|
|
|
|
|
// return 1;
|
|
|
|
|
// } else if (o1OrderTime < o2OrderTime) {
|
|
|
|
|
// return -1;
|
|
|
|
|
// }
|
|
|
|
|
// return 0;
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|