java/JiaDianHuiShou.git

			@@ -117,14 +117,25 @@

			@Override
			public List<Order> excelExport(OrderQueryRequest orderQueryRequest) {
			List<String> ids = orderQueryRequest.getIds();
			List<Order> list;
			if (null != ids && !ids.isEmpty()) {
			list = baseMapper.exportByIdList(ids);
			} else {
			list = baseMapper.exportList(orderQueryRequest);
			// List<String> ids = orderQueryRequest.getIds();
			// List<Order> list;
			// if (null != ids && !ids.isEmpty()) {
			// list = baseMapper.exportByIdList(ids);
			// } else {
			// list = baseMapper.exportList(orderQueryRequest);
			// }
			List<Order> orders = baseMapper.excelExportList(orderQueryRequest);
			List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
			.eq(ChangeDispatch::getIsDelete, 0)
			.orderByDesc(ChangeDispatch::getCreateTime).list();
			for (Order order : orders) {
			ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
			.findFirst().orElse(null);
			if (null != changeDispatch) {
			order.setApplyReason(changeDispatch.getApplyReason());
			}
			}
			return list;
			return orders;
			}

			@Override
			@@ -209,8 +220,9 @@
			}

			@Override
			public Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
			return baseMapper.orderListWorker(userId, state, Page.of(pageNum, pageSize));
			public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
			Page<Order> orderPage = baseMapper.orderListWorker(userId, state, searchValues, Page.of(pageNum, pageSize));
			return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
			}

			@Override