Browse Source

fix 福袋统计去掉测试分部

周箭河 5 years ago
parent
commit
014344bfee

+ 4 - 2
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -303,6 +303,7 @@ public class StudentOrderController extends BaseController {
             for (OrderStatisDto order : orders) {
                 if (organ.getName().equals(order.getOrganName())) {
                     flag = true;
+                    break;
                 }
             }
             if (!flag) {
@@ -316,15 +317,16 @@ public class StudentOrderController extends BaseController {
 
         BigDecimal totalMoney = BigDecimal.ZERO;
         Integer totalNum = 0;
+        ArrayList<OrderStatisDto> newOrders = new ArrayList<>();
         for (OrderStatisDto order : orders) {
             if (order.getOrganName().equals("总部国际") || order.getOrganName().equals("阳光总部国际") || order.getOrganName().equals("武汉小学")){
-                orders.remove(order);
                 continue;
             }
+            newOrders.add(order);
             totalMoney = totalMoney.add(order.getMoney());
             totalNum += order.getNums();
         }
-        orders = orders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
+        orders = newOrders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
 
         LuckStatisDto luckStatisDto = new LuckStatisDto();
         luckStatisDto.setOrderStatisDtoList(orders);