Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -297,5 +297,5 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param calenderIds
      * @return
      */
-    List<MusicGroupPaymentCalender> getPaymentCalenderWithCalenderIdsAndPayUserType(@Param("calenderIds") List<Long> calenderIds, @Param("payUserType") PayUserType payUserType);
+    List<MusicGroupPaymentCalender> getPaymentCalenderWithCalenderIdsAndPayUserType(@Param("calenderIds") List<Object> calenderIds, @Param("payUserType") PayUserType payUserType);
 }

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

@@ -371,7 +371,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 throw new BizException("导入数据错误  重复的交易流水号:{}", list.get(0));
             }
 
-            List<Long> calenderIds = sheet.stream().map(m -> Long.parseLong(m.get("学校缴费项id").toString())).collect(Collectors.toList());
+            List<Object> calenderIds = sheet.stream().map(m -> m.get("学校缴费项id")).collect(Collectors.toList());
             List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.getPaymentCalenderWithCalenderIdsAndPayUserType(calenderIds, MusicGroupPaymentCalender.PayUserType.SCHOOL);
             Map<String, Long> schoolCalender = calenders.stream().collect(Collectors.toMap(m -> m.getId().toString(), MusicGroupPaymentCalender::getId));
 
@@ -528,7 +528,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             }
             studentPaymentRouteOrderDao.batchAdd(studentPaymentRouteOrders);
         } else {
-            throw new BizException("导入失败：没有可以录入的数据");
+            throw new BizException(sb.length() > 0 ? sb.toString() : "导入失败：没有可以录入的数据");
         }
         HttpResponseResult httpResponseResult = new HttpResponseResult();
         httpResponseResult.setData(studentPaymentRouteOrders);