diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
index 2098a7a3..492301ad 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
@@ -5,7 +5,7 @@
SELECT
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
FROM (
- SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw,kt.skrq
+ SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwmc AS tkdw,kt.skrq
FROM
kc_evaluation ev,
kc_ketangbiao kt,
@@ -27,7 +27,7 @@
and kkdw = #{kcEvaluation.kkdw}
- and college = #{kcEvaluation.szdw}
+ and cu.dwmc = #{kcEvaluation.szdw}
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 6283126d..39f61ce8 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
@@ -900,8 +900,8 @@
select xb.gh as userid,xb.xm as username,tkyq.yskcs as tkyq,count(tk.id) as sjtksl
from xxhbuser xb
LEFT JOIN (select gh,max(ytkcs) yskcs from kc_export_config_tpkwcqkjzglx where gh = #{userid} and xqxn = #{xnxq}) tkyq on xb.gh = tkyq.gh
- LEFT JOIN kc_tingke tk on xb.gh = tk.userid
- where tk.tingketime >= #{startTime} and tk.tingketime <= concat(#{endTime},' 23:59:59') and tk.userid = #{userid}
+ LEFT JOIN kc_evaluation tk on xb.gh = tk.upuserid
+ where tk.up_date >= #{startTime} and tk.up_date <= concat(#{endTime},' 23:59:59') and tk.upuserid = #{userid}
ORDER BY tkyq.yskcs desc