From 904379bda239e7f73c11b583eb2b3ffc102c47cb Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 18 Aug 2023 19:54:32 +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 --- .../controller/KcExportConfigTpkwcqkjzglxController.java | 3 ++- .../kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml | 2 +- .../jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) 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 f1156860..7827b68c 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 @@ -83,7 +83,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcExportConfigTpkwcqkjzglx, req.getParameterMap()); // queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); @@ -104,6 +104,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController 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 a75b5649..2098a7a3 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 + 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 FROM kc_evaluation ev, kc_ketangbiao kt, @@ -46,11 +46,11 @@