yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-06-15 08:49:56 +08:00
parent dbf2b7ffcf
commit 023e181808
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java
View File

@ -220,6 +220,8 @@ public class KcTingke implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String score; private String score;
@TableField(exist = false)
private String ketangbiaoid;
// private java.lang.String tingketime; // private java.lang.String tingketime;
} }

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
View File

@ -421,7 +421,8 @@
( (
SELECT SELECT
tingketime, 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, DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian,
TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq, TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq,
TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,kt.kcbh, TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,kt.kcbh,
@ -498,8 +499,11 @@
<if test='pj == "1"'> <if test='pj == "1"'>
and score is not null and score is not null
</if> </if>
</if> </if>
<if test="ketangbiaoid != null and ketangbiaoid != ''">
and tk.ketangbiaoid = #{ketangbiaoid}
</if>
</where> </where>
<if test="pageSize != -1 and pageSize != null"> <if test="pageSize != -1 and pageSize != null">
LIMIT #{pageSize} LIMIT #{pageSize}