|
|
@@ -51,7 +51,10 @@
|
|
|
and t.end_time = #{dto.endTime}
|
|
|
</if>
|
|
|
<if test="dto.credentialNumber != null and dto.endTime != ''">
|
|
|
- and t.end_time = #{dto.credentialNumber}
|
|
|
+ and t5.credential_number = #{dto.credentialNumber}
|
|
|
+ </if>
|
|
|
+ <if test="dto.name != null and dto.name != ''">
|
|
|
+ and t.name like concat('%', #{dto.name},'%')
|
|
|
</if>
|
|
|
ORDER BY t.id DESC;
|
|
|
</select>
|
|
|
@@ -80,10 +83,13 @@
|
|
|
and t1.start_time <= #{dto.endDate}
|
|
|
</if>
|
|
|
<if test="dto.isHandle != null">
|
|
|
- and t.adjust_type is not null
|
|
|
+ and t1.adjust_type is not null
|
|
|
</if>
|
|
|
<if test="dto.studentName != null and dto.studentName != ''">
|
|
|
- and t.name like concat('$',#{dto.studentName},'%')
|
|
|
+ and t1.name like concat('$',#{dto.studentName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="dto.credentialNumber != null and dto.endTime != ''">
|
|
|
+ and t3.credential_number = #{dto.credentialNumber}
|
|
|
</if>
|
|
|
</select>
|
|
|
|