修改bug
This commit is contained in:
parent
dbf2b7ffcf
commit
023e181808
|
@ -220,6 +220,8 @@ public class KcTingke implements Serializable {
|
|||
|
||||
@TableField(exist = false)
|
||||
private String score;
|
||||
@TableField(exist = false)
|
||||
private String ketangbiaoid;
|
||||
|
||||
// private java.lang.String tingketime;
|
||||
}
|
||||
|
|
|
@ -421,7 +421,8 @@
|
|||
(
|
||||
SELECT
|
||||
tingketime,
|
||||
IF (CURDATE()= DATE_FORMAT( tk.tingketime, '%Y/%m/%d' ),'',DATE_FORMAT( tk.tingketime, '%Y-%m-%d' )) AS tkrq,
|
||||
<!-- IF (CURDATE()= DATE_FORMAT( tk.tingketime, '%Y/%m/%d' ),'',DATE_FORMAT( tk.tingketime, '%Y-%m-%d' )) AS tkrq,-->
|
||||
ifnull(DATE_FORMAT( tk.tingketime, '%Y-%m-%d' ),'') tkrq,
|
||||
DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian,
|
||||
TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq,
|
||||
TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,kt.kcbh,
|
||||
|
@ -498,8 +499,11 @@
|
|||
<if test='pj == "1"'>
|
||||
and score is not null
|
||||
</if>
|
||||
|
||||
</if>
|
||||
<if test="ketangbiaoid != null and ketangbiaoid != ''">
|
||||
and tk.ketangbiaoid = #{ketangbiaoid}
|
||||
</if>
|
||||
|
||||
</where>
|
||||
<if test="pageSize != -1 and pageSize != null">
|
||||
LIMIT #{pageSize}
|
||||
|
|
Loading…
Reference in New Issue