|
|
@@ -198,12 +198,11 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
int start = 0;
|
|
|
LinkedList<OrderExcelDTO> list = Lists.newLinkedList();
|
|
|
for (int i = 0; i < maxPage; i++) {
|
|
|
- list = baseMapper.orderExcel(queryWrapper,dbName,operatorId,start);
|
|
|
- start = list.getLast().getId();
|
|
|
- list.addAll(list);
|
|
|
+ LinkedList<OrderExcelDTO> findList = baseMapper.orderExcel(queryWrapper,dbName,operatorId,start);
|
|
|
+ start = findList.getLast().getId();
|
|
|
+ list.addAll(findList);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
for (OrderExcelDTO orderExcelDTO : list) {
|
|
|
for (OrderConstantEnum.OrderStatus status : EnumUtils.getEnumList(OrderConstantEnum.OrderStatus.class)) {
|
|
|
if (status.getCode().toString().equals(orderExcelDTO.getOrderStatus())) {
|
|
|
@@ -232,7 +231,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- log.info("id===="+orderExcelDTO.getId()+"====account===="+orderExcelDTO.getPayAccount());
|
|
|
orderExcelDTO.setPayAccount(getPayAccountString(orderExcelDTO.getPayAccount()));
|
|
|
orderExcelDTO.setStationOrGroupName(StringUtils.isNotBlank(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
|
|
|
}
|
|
|
@@ -257,7 +255,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
for (String s : payAccount.split(",")) {
|
|
|
if(StringUtils.isNotBlank(s)){
|
|
|
- log.info("ssssss===="+s);
|
|
|
for (PayAccount account : EnumUtils.getEnumList(PayAccount.class)) {
|
|
|
if(account.getCode().equals(Integer.parseInt(s))){
|
|
|
sb.append(account.getDisplay()+",");
|