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

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

@@ -427,6 +427,7 @@
                  LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE s.operating_tag_ = 1
           AND su.organ_id_ > 0
+          AND su.user_type_ LIKE '%STUDENT%'
         GROUP BY su.organ_id_
     </select>
 </mapper>

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

@@ -768,14 +768,20 @@
 			<if test="courseScheduleId!=null">
 				AND cs.id_=#{courseScheduleId}
 			</if>
-			<if test="signInStatus!=null">
+			<if test="signInStatus!=null and signInStatus==1">
 				AND ta.sign_in_status_=#{signInStatus}
 			</if>
-			<if test="signOutStatus!=null">
+            <if test="signInStatus!=null and signInStatus==0">
+                AND (ta.sign_in_status_=#{signInStatus} OR ta.sign_in_status_ IS NULL)
+            </if>
+			<if test="signOutStatus!=null and signOutStatus==1">
 				AND ta.sign_out_status_=#{signOutStatus}
 			</if>
+            <if test="signOutStatus!=null and signOutStatus==1">
+                AND (ta.sign_out_status_=#{signOutStatus} OR ta.sign_out_status_ IS NULL)
+            </if>
 			<if test="confirmStatus!=null">
-				AND csts.confirm_status_=#{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				AND csts.confirm_status_=#{confirmStatus}
 			</if>
 			<if test="groupName!=null">
 				AND cs.name_ LIKE CONCAT('%', #{groupName}, '%')

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

@@ -275,12 +275,19 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.teach_mode_ = 'ONLINE'
         LEFT JOIN student s ON s.user_id_ = cssp.user_id_
+        <if test="groupType != null and groupType==@com.ym.mec.biz.dal.enums.GroupType@PRACTICE">
+            LEFT JOIN practice_group pg ON cssp.music_group_id_ = pg.id_ AND cssp.group_type_ = 'PRACTICE'
+        </if>
         WHERE FIND_IN_SET(s.teacher_id_, #{teacherIds})
         AND cs.status_ IN ('NOT_START', 'UNDERWAY')
         AND (cs.is_lock_ IS NULL OR cs.is_lock_ = 0)
         <if test="groupType != null">
             AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
+        <if test="groupType != null and groupType==@com.ym.mec.biz.dal.enums.GroupType@PRACTICE">
+            AND pg.group_status_ IN ('NORMAL', 'FINISH')
+            AND pg.buy_months_ >= 1
+        </if>
         GROUP BY s.teacher_id_
     </select>
     <select id="getPracticeAndVipNums" resultType="java.util.Map">