From fb0d553c821dd6786622dd8f053bbb55a583aad7 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 19 May 2023 21:29:18 +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

---
 .../modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml   | 4 +++-
 .../jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml   | 3 +++
 .../org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
index 9ea3f4b2..522c4691 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml
@@ -5,7 +5,9 @@
     <select id="getIndexList" resultType="org.jeecg.modules.kc.kcGongkaike.entity.KcGongkaike">
         SELECT * from (
             SELECT * from (
-            select *,'1' as  type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d')
+            select * from (
+                select *,'1' as  type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc
+            ) a2
             union
             select *,'2' as type from kc_gongkaike where rq &lt; DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc
             ) a ORDER BY type asc
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
index f4c45edf..9f19b013 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
@@ -69,6 +69,9 @@
             <if test="kcKetangbiao.kcxz!=null and kcKetangbiao.kcxz!=''">
                 and ktb.kcxz = #{kcKetangbiao.kcxz}
             </if>
+            <if test="kcKetangbiao.skdd!=null and kcKetangbiao.skdd!=''">
+                and ktb.skdd like concat('%',#{kcKetangbiao.skdd},'%')
+            </if>
             <if test="kcKetangbiao.kkdw!=null and kcKetangbiao.kkdw!=''">
                 and ktb.kkdw = #{kcKetangbiao.kkdw}
             </if>
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 d2a9925c..b3c29211 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
@@ -42,6 +42,9 @@
         <if test="kcTingke.kcxz!=null and kcTingke.kcxz!=''">
             AND kcxz = #{kcTingke.kcxz}
         </if>
+        <if test="kcTingke.username!=null and kcTingke.username!=''">
+            AND (tk.username like CONCAT('%',#{kcTingke.username},'%') or tk.userid like CONCAT('%',#{kcTingke.username},'%'))
+        </if>
         GROUP BY tk.userid, tk.username, college
         ) tk LEFT JOIN (
         SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc