Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -171,19 +171,19 @@ public class OpenDouble11StaticsController extends BaseController {
             });
         }
 
-        Double11StaticWrapper.SaleAmountAndUser total = new Double11StaticWrapper.SaleAmountAndUser();
-        total.setOrganName("总部");
-        double acAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getActualAmount)
-                .mapToDouble(BigDecimal::doubleValue).sum();
-        total.setActualAmount(new BigDecimal(acAmount));
-        double baAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getBalancePaymentAmount)
-                .mapToDouble(BigDecimal::doubleValue).sum();
-        total.setBalancePaymentAmount(new BigDecimal(baAmount));
-        int totalUser = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getUserPurchaseNumber)
-                .mapToInt(Integer::intValue).sum();
-        total.setUserPurchaseNumber(totalUser);
-
-        result.add(0, total);
+//        Double11StaticWrapper.SaleAmountAndUser total = new Double11StaticWrapper.SaleAmountAndUser();
+//        total.setOrganName("总部");
+//        double acAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getActualAmount)
+//                .mapToDouble(BigDecimal::doubleValue).sum();
+//        total.setActualAmount(new BigDecimal(acAmount));
+//        double baAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getBalancePaymentAmount)
+//                .mapToDouble(BigDecimal::doubleValue).sum();
+//        total.setBalancePaymentAmount(new BigDecimal(baAmount));
+//        int totalUser = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getUserPurchaseNumber)
+//                .mapToInt(Integer::intValue).sum();
+//        total.setUserPurchaseNumber(totalUser);
+//
+//        result.add(0, total);
         return R.from(result);
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -200,16 +200,16 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             Map<Integer, String> operatorNames = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(StringUtils.join(operatorIds, ",")));
             Map<Integer, String> userNames = MapUtil.convertMybatisMap(teacherDao.queryUsernameByIds(userIds));
             rows.forEach(e -> {
+                StringBuffer sb = new StringBuffer();
                 for (String organId : e.getOrganId().split(",")) {
-                    StringBuffer sb = new StringBuffer();
                     if (organNames.containsKey(Integer.parseInt(organId))) {
                         if(sb.length() > 0){
                             sb.append(",");
                         }
                         sb.append(organNames.get(Integer.parseInt(organId)));
                     }
-                    e.setOrganName(sb.toString());
                 }
+                e.setOrganName(sb.toString());
                 if (e.getUserId() != null) {
                     e.setUserName(userNames.get(e.getUserId()));
                 }