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<KcExpo
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
+		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper("a",kcExportConfigTpkwcqkjzglx, req.getParameterMap());
 //		queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
 		Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
 		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
@@ -104,6 +104,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 				KcTkcstj tkcstj = tjMap.get(x.getGh());
 				x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
 				x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
+				x.setXqxn(kcXqxnHistory.getTitle());
 			}
 		});
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml
index 65beca80..64ff5fd9 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/mapper/xml/XxhbbkjxtkpjGoodLogMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.kc.grab.log.mapper.XxhbbkjxtkpjGoodLogMapper">
 
     <select id="selectPage" resultType="org.jeecg.modules.kc.grab.log.entity.XxhbbkjxtkpjBadLog">
-        select a.*,b.title as xqxn from xxhbbkjxtkpj_bad_log a
+        select a.*,b.title as xqxn from xxhbbkjxtkpj_good_log a
         LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
         ${ew.customSqlSegment}
     </select>
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 @@
     </select>
 
     <select id="getPkmxbList" parameterType="org.jeecg.modules.kc.qa.entity.KcEvaluation" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
-        SELECT pk.*, au.assess1 as tksf FROM
+        SELECT pk.*, au.assess1 as tksf,xnxq.title as xqxn FROM
         (
         SELECT
         k.id,c.gh as userid, c.xm as username, c.dwh as college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver,
-        k.bz,
+        k.bz,k.skrq,
         p.source
         FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
         WHERE
@@ -69,6 +69,7 @@
         </if>
         ) AS pk
         LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
+        LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time  and pk.skrq &lt;= xnxq.end_time
         <where>
             <if test="kcEvaluation.kcxz != null and kcEvaluation.kcxz != ''">
                 and pk.kcxz = #{kcEvaluation.kcxz}