Joburgess 5 years ago
parent
commit
2f9230a321

+ 7 - 0
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -230,6 +230,9 @@
 			<if test="status!=null">
 				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
+			<if test="search!=null and search!=''">
+				AND (er.student_id_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR eb.name_ LIKE CONCAT('%', #{search}, '%'))
+			</if>
 		</where>
 	</sql>
 
@@ -257,6 +260,7 @@
 			exam_registration er
 			LEFT JOIN sys_user su ON er.student_id_ = su.id_
 			LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
+			LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		<include refid="queryCondition"/>
 		ORDER BY er.id_
 		<include refid="global.limit"/>
@@ -328,6 +332,7 @@
 			LEFT JOIN sys_user su ON er.student_id_ = su.id_
 			LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
 			LEFT JOIN exam_room ero ON ero.id_ = ersr.exam_room_id_
+			LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		<include refid="queryCondition"/>
 		ORDER BY er.id_ DESC
 		<include refid="global.limit"/>
@@ -335,7 +340,9 @@
 
 	<select id="countExamRegist" resultType="int">
 		SELECT COUNT(*) FROM exam_registration er
+		LEFT JOIN sys_user su ON er.student_id_ = su.id_
 		LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
+		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		<include refid="queryCondition"/>
 	</select>