Merge remote-tracking branch 'origin/master'

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

@@ -12,5 +12,5 @@ public interface ChargeTypeOrganizationFeeDao extends BaseDAO<Integer, ChargeTyp
      * @param organId
      * @return
      */
-    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") Integer organId);
+    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -36,7 +36,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -995,7 +995,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		if (studentAttendanceList != null && studentAttendanceList.size() > 0) {
-			studentAttendanceDao.batchUpdate(studentAttendanceList);
+			studentAttendanceDao.addStudentAttendances(studentAttendanceList);
 		}
 		
 		//自动更新课程状态至“已结束”

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

@@ -59,7 +59,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
     @Override
-    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number) {
+    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number) {
         List<Subject> subByChargeTypeId = subjectDao.findDefaultSubByChargeTypeId(chargeTypeId);
         ChargeTypeOrganizationFee byOrganId = chargeTypeOrganizationFeeDao.findByOrganId(chargeTypeId, organId);
         if(byOrganId != null){

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

@@ -75,8 +75,7 @@
 
     <select id="findByOrganId" resultMap="chargeTypeOrganizationFee">
 		SELECT * FROM charge_type_organization_fee ctof
-		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND ctof.organ_id_ = #{organId}
-		ORDER BY ctof.create_time_ DESC
-		LIMIT 1
+		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND FIND_INT_SET(ctof.organ_id_,#{organId})
+		ORDER BY ctof.create_time_ DESC LIMIT 1
 	</select>
 </mapper>

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

@@ -1390,12 +1390,13 @@
     </delete>
     
     <select id="queryUnsignedStudentList" resultMap="StudentAttendance">
-        SELECT a.*,cg.current_class_times_ FROM (SELECT cgsm.user_id_,cs.actual_teacher_id_ teacher_id_,cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_
+        SELECT a.*,cg.current_class_times_ FROM (SELECT cgsm.user_id_,cs.actual_teacher_id_ teacher_id_,
+        cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_
         FROM class_group_student_mapper cgsm
         right JOIN course_schedule cs ON cgsm.class_group_id_ = cs.class_group_id_
         WHERE cgsm.status_ = 'NORMAL' AND CONCAT(cs.class_date_,' ',cs.end_class_time_) &lt;= now()) a
         LEFT JOIN student_attendance sa ON a.course_schedule_id_ = sa.course_schedule_id_
-        LEFT JOIN class_group cg ON a.class_group_id_ = cg.id_ WHERE sa.user_id_ IS null
+        LEFT JOIN class_group cg ON a.class_group_id_ = cg.id_ WHERE sa.id_ IS NULL
     </select>
     <select id="getNextCourseSchedule" resultMap="CourseSchedule">
         SELECT

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

@@ -117,7 +117,7 @@
 	<sql id="queryCondition">
 		<where>
 			vga.del_flag_=0
-			AND FIND_IN_SET(organ_id_,#{organId})
+			AND dbo.INTE_ARRAY(organ_id_,#{organId})
 		</where>
 	</sql>
 

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -63,7 +63,7 @@ public class SubjectController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('subject/findDefaultSubByChargeTypeId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "organId", value = "分部编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number){
+    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number){
         if(chargeTypeId == null || organId == null || number == null){
             throw new BizException("参数校验错误");
         }