Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamTeacherSalaryMapper.xml

@@ -171,7 +171,7 @@
 				AND ets.settlement_type_ = #{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="search!=null">
-				AND (ets.teacher_id_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%'))
+				AND (ets.teacher_id_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR eb.name_ LIKE CONCAT('%', #{search}, '%') OR ets.examination_basic_id_=#{search})
 			</if>
 		</where>
 	</sql>
@@ -179,6 +179,7 @@
 	<select id="queryExamTeacherSalary" resultMap="ExamTeacherSalaryDto" parameterType="map">
 		SELECT ets.*,su.real_name_ teacher_real_name_,su.phone_ teacher_phone_,t.city_,t.certificate_no_
 		FROM exam_teacher_salary ets
+		LEFT JOIN examination_basic eb ON ets.examination_basic_id_=eb.id_
 		LEFT JOIN sys_user su ON ets.teacher_id_=su.id_
 		left join teacher t on t.user_id_ = ets.teacher_id_
 		<include refid="queryExamTeacherSalaryCondition"/>
@@ -187,6 +188,7 @@
 
 	<select id="countExamTeacherSalary" resultType="int">
 		SELECT COUNT(*) FROM exam_teacher_salary ets
+		LEFT JOIN examination_basic eb ON ets.examination_basic_id_=eb.id_
 		LEFT JOIN sys_user su ON ets.teacher_id_=su.id_
 		<include refid="queryExamTeacherSalaryCondition"/>
 	</select>