add 获取分部所有课程时长接口

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

@@ -228,48 +228,51 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
 
     /**
      * 获取乐团报名的缴费日历
+     *
      * @param musicGroupId
      * @return
      */
     MusicGroupPaymentCalender getMusicGroupRegCalender(@Param("musicGroupId") String musicGroupId);
 
     /**
+     * @param userId:
+     * @param musicGroupId:
+     * @return java.util.Map<java.lang.String, java.lang.String>
      * @describe 获取学员在乐团的缴费状态
      * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
      * @author zouxuan
      * @date 2020/11/4
      * @time 15:43
-     * @param userId:
-     * @param musicGroupId:
-     * @return java.util.Map<java.lang.String,java.lang.String>
      */
     List<Map<String, String>> queryUserPaymentStatus(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 
     /**
+     * @param studentId:
+     * @param musicGroupId:
+     * @return java.util.List<java.util.Map < java.lang.Integer, java.lang.String>>
      * @describe 获取学员再乐团的缴费状态
      * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
      * @author zouxuan
      * @date 2020/11/11
      * @time 14:03
-     * @param studentId:
-     * @param musicGroupId:
-     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
      */
-    List<Map<Integer,String>> queryUserCoursePaymentStatus(@Param("studentId") Set studentId, @Param("musicGroupId") String musicGroupId);
+    List<Map<Integer, String>> queryUserCoursePaymentStatus(@Param("studentId") Set studentId, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 缴费预计人数减一
-     * @author
+     *
      * @param userId
+     * @author
      */
     void cutCalenderExpectNum(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取需要删除的缴费项
-     * @author zouxuan
+     *
      * @param userId
      * @param musicGroupId
      * @return
+     * @author zouxuan
      */
     List<Long> findStudentNoPaymentCalender(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 
@@ -280,10 +283,19 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
 
     /**
      * 根据批次号，学员编号和课程类型查询
-     * @author zouxuan
+     *
      * @param batchNo
      * @param studentId
      * @return
+     * @author zouxuan
      */
     Set<Long> findByBatchNoAndStudentId(@Param("batchNo") String batchNo, @Param("studentId") Integer studentId);
+
+    /**
+     * 根据calenderIds获取学校缴费项
+     *
+     * @param calenderIds
+     * @return
+     */
+    List<MusicGroupPaymentCalender> getPaymentCalenderWithCalenderIdsAndPayUserType(@Param("calenderIds") List<Long> calenderIds, @Param("payUserType") PayUserType payUserType);
 }

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

@@ -64,6 +64,8 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private TeacherDao teacherDao;
+    @Autowired
+	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
 
     @Override
     public BaseDAO<Long, StudentPaymentRouteOrder> getDAO() {
@@ -337,6 +339,9 @@ 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<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.getPaymentCalenderWithCalenderIdsAndPayUserType(calenderIds, MusicGroupPaymentCalender.PayUserType.SCHOOL);
+			Map<String, Long> schoolCalender = calenders.stream().collect(Collectors.toMap(m->m.getId().toString(), MusicGroupPaymentCalender::getId));
 
 			valueIsNull: for (int j = 0; j < sheet.size(); j++) {
 				int rowNum = j + 2;
@@ -426,7 +431,12 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 						if(StringUtils.isEmpty(row.get(s).toString())){
 							sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不可为空;");
 							continue valueIsNull;
+						}else if(!schoolCalender.containsKey(row.get(s).toString())) {
+							sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不存在;");
+						}else {
+							objectMap.put("calenderId", row.get(s));
 						}
+						continue;
 					}
 					objectMap.put(columnValue, row.get(s));
 				}

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -542,4 +542,13 @@
         LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
         WHERE batch_no_ = #{batchNo} AND mgpcd.user_id_ = #{studentId}
     </select>
+
+    <select id="getPaymentCalenderWithCalenderIdsAndPayUserType" resultMap="MusicGroupPaymentCalender">
+        SELECT * FROM music_group_payment_calender mgpc
+        WHERE id_ IN
+        <foreach collection="calenderIds" item="calenderId" open="(" close=")" separator=",">
+            #{calenderId}
+        </foreach>
+        AND pay_user_type_ = #{payUserType}
+    </select>
 </mapper>