diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index fc19fadb..cca6df44 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -237,7 +237,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcTingke, req.getParameterMap()); queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"tk.tingketime",kcTingke.getStartTime()); queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"tk.tingketime",kcTingke.getEndTime()+" 23:59:59"); - queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"cn",kcTingke.getJsxm()); + queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"tk.username",kcTingke.getJsxm()); queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"college",kcTingke.getSzdw()); queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assess1",kcTingke.getTksf()); queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"tk.kkdw",kcTingke.getKkdw()); 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 41c27681..55e67528 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 @@ -25,8 +25,10 @@ FROM ( SELECT tk.userid, tk.username, count( tk.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw , kt.skrq,kt.kcxz - FROM kc_tingke tk, kc_ketangbiao kt, kc_casusers cu - WHERE tk.kechengbiaoid = kt.id AND tk.userid = cu.`user` AND tk.tingketime > 1 + FROM kc_tingke tk + LEFT JOIN kc_ketangbiao kt on tk.kechengbiaoid = kt.id + LEFT JOIN kc_casusers cu on tk.userid = cu.`user` + WHERE tk.tingketime > 1 AND kt.skrq >= #{kcTingke.startTime} @@ -115,19 +117,22 @@