|
|
@@ -138,7 +138,7 @@
|
|
|
<![CDATA[AND erp.create_time_ <= #{endTime}]]>
|
|
|
</if>
|
|
|
<if test="examName!=null">
|
|
|
- AND eb.name_=#{examName}
|
|
|
+ AND eb.name_ LIKE CONCAT('%', #{examName}, '%')
|
|
|
</if>
|
|
|
<if test="organIds!=null">
|
|
|
AND erp.organ_id_ IN
|
|
|
@@ -147,7 +147,7 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="search!=null">
|
|
|
- AND (ec.card_no_ LIKE CONCAT('%', #{serch}, '%'))
|
|
|
+ AND (erp.student_id_=#{serch} OR ec.card_no_ LIKE CONCAT('%', #{serch}, '%') OR su.real_name_ LIKE CONCAT('%', #{serch}, '%'))
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
@@ -166,6 +166,7 @@
|
|
|
SELECT erp.*,eb.exam_location_id_list_,ec.card_no_ FROM exam_registration_payment erp
|
|
|
LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
|
|
|
LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
|
|
|
+ LEFT JOIN sys_user su ON erp.student_id_=su.id_
|
|
|
<include refid="queryCondition"/>
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
@@ -175,6 +176,7 @@
|
|
|
SELECT COUNT(*) FROM exam_registration_payment erp
|
|
|
LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
|
|
|
LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
|
|
|
+ LEFT JOIN sys_user su ON erp.student_id_=su.id_
|
|
|
<include refid="queryCondition"/>
|
|
|
</select>
|
|
|
|
|
|
@@ -230,9 +232,11 @@
|
|
|
<resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto"
|
|
|
extends="ExamRegistrationPayment">
|
|
|
<result column="card_no_" property="cardNo"/>
|
|
|
+
|
|
|
<association property="examRegistration"
|
|
|
select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo"
|
|
|
column="{id=exam_registration_id_}"/>
|
|
|
+
|
|
|
<association property="examLocations" select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds"
|
|
|
column="{ids=exam_location_id_list_}"/>
|
|
|
</resultMap>
|
Joburgess