修改bug

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

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>

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