From 023e1818081092f9b0fa53a33529bc5303e3fcb4 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 15 Jun 2023 08:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/kc/tktj/entity/KcTingke.java   | 2 ++
 .../jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml   | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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,
+<!--                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}