|
@@ -21,6 +21,7 @@ import java.util.stream.Stream;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.snaker.engine.entity.Order;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -317,16 +318,17 @@ public class StudentOrderController extends BaseController {
|
|
|
|
|
|
BigDecimal totalMoney = BigDecimal.ZERO;
|
|
|
Integer totalNum = 0;
|
|
|
- ArrayList<OrderStatisDto> newOrders = new ArrayList<>();
|
|
|
- for (OrderStatisDto order : orders) {
|
|
|
+ Iterator<OrderStatisDto> iterator = orders.iterator();
|
|
|
+ while (iterator.hasNext()){
|
|
|
+ OrderStatisDto order = iterator.next();
|
|
|
if (order.getOrganName().equals("总部国际") || order.getOrganName().equals("阳光总部国际") || order.getOrganName().equals("武汉小学")){
|
|
|
+ iterator.remove();
|
|
|
continue;
|
|
|
}
|
|
|
- newOrders.add(order);
|
|
|
totalMoney = totalMoney.add(order.getMoney());
|
|
|
totalNum += order.getNums();
|
|
|
}
|
|
|
- orders = newOrders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
|
|
|
+ orders = orders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
|
|
|
|
|
|
LuckStatisDto luckStatisDto = new LuckStatisDto();
|
|
|
luckStatisDto.setOrderStatisDtoList(orders);
|