Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/resources/mapper/paperstudent/EPsqBatchMapper.xml

     <select id="listPsqBatchDetail" resultType="java.util.Map">
         select d.detailid,d.studentid,d.eptqid,d.qn,d.stuscore,d.newscore,d.createtime,
         u.username,u.loginname from e_psqbatch_detail d left join t_user u on d.studentid=u.userid
-        where d.batchid=#{ed.batchid} order by studentid,d.eptqid
+        where d.batchid=#{ed.batchid}
+        <if test="ed.eptqid!=null and ed.eptqid!='' and ed.eptqid!='0'.toString()">
+            and d.eptqid=#{ed.eptqid}
+        </if>
+        <if test="ed.username!=null and ed.username!=''">
+            and (u.username like concat('%', #{ed.username}, '%') or u.loginname like concat('%', #{ed.username}, '%'))
+        </if>
+        order by studentid,d.eptqid
     </select>
 
 </mapper>