From fdfec9e3186cd541426cdb24cd138a8dd8fbaf06 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 13 Jan 2025 09:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
index a102f63f..aee2aa7a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
@@ -231,8 +231,13 @@
     <select id="getStudentRiliKclist" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
         select b.rwbh,b.kcmc,GROUP_CONCAT(DISTINCT b.skjs  ) as skjs,b.skrq,b.jgh,b.xnxq from xxhbxsxkb a , kc_ketangbiao b
         where a.KCAPZBBH = b.rwbh and a.xh = #{xh} and b.xnxq = #{xnxq}
-        and b.skrq like concat(DATE_FORMAT(NOW(),'%Y-%m'),'%')
-        GROUP BY b.rwbh,b.kcmc,b.skrq,b.jgh,b.xnxq
+        <if test="skrq!=null and skrq!=''">
+            and b.skrq like concat(#{skrq},'%')
+        </if>
+        <if test="skrq==null">
+            and b.skrq like concat(DATE_FORMAT(NOW(),'%Y-%m'),'%')
+        </if>
+        GROUP BY b.rwbh,b.kcmc,b.skrq,b.xnxq
     </select>
 
     <update id="updateSzkc">