diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java
index 56c453c2..9fa16691 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java
@@ -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;
}
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
index 84cdaf63..6503d262 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
@@ -421,7 +421,8 @@
(
SELECT
tingketime,
- 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 @@
and score is not null
-
+
+ and tk.ketangbiaoid = #{ketangbiaoid}
+
+
LIMIT #{pageSize}