فهرست منبع

1、VIP课修改列表增加是否结算字段

Joburgess 5 سال پیش
والد
کامیت
2099602d20

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -213,5 +213,5 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param courseScheduleIds: 课程编号列表
 	 * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
 	 */
-	List<Map<Integer,Integer>> checkCoursesIsSettlement(@Param("courseScheduleIds") List<Integer> courseScheduleIds);
+	List<Map<Long,Integer>> checkCoursesIsSettlement(@Param("courseScheduleIds") List<Integer> courseScheduleIds);
 }

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1381,10 +1381,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 List<Integer> courseScheduleIds = dataList.stream()
                         .map(courseSchedule -> courseSchedule.getId().intValue())
                         .distinct().collect(Collectors.toList());
-                List<Map<Integer, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
-                Map<Integer, Integer> courseSettlementMap = MapUtil.convertMybatisMap(courseSettlementMaps);
+                List<Map<Long, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
+                Map<Long, Long> courseSettlementMap = MapUtil.convertIntegerMap(courseSettlementMaps);
                 dataList.forEach(courseSchedule -> {
-                    Integer isSettlement = courseSettlementMap.get(courseSchedule.getId());
+                    Long isSettlement = courseSettlementMap.get(courseSchedule.getId().longValue());
                     if(Objects.isNull(isSettlement)||isSettlement<=0){
                         courseSchedule.setIsSettlement(0);
                     }else{

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -367,7 +367,7 @@
 	</select>
 	<select id="checkCoursesIsSettlement" resultType="java.util.Map">
 		SELECT
-			course_schedule_id_ AS 'key',
+            course_schedule_id_ AS 'key',
 			COUNT(*) AS 'value'
 		FROM
 			course_schedule_teacher_salary