From 5c25fabb6cbedc1d6c86aadca99bb11ca29c58a3 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Fri, 30 Jun 2023 20:18:00 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8830=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=AF=84=E8=AF=BE=E7=BB=9F=E8=AE=A1=E5=92=8C=20?=
 =?UTF-8?q?=E8=AF=84=E8=AF=BE=E6=98=8E=E7=BB=86=E5=AF=B9=E4=B8=8D=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml   | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

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 1f849f95..aed5913f 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,17 +5,17 @@
         SELECT
         tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
         FROM (
-        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college 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
         FROM
         kc_evaluation ev,
         kc_ketangbiao kt,
-        kc_casusers cu
-        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
+        xxhbuser cu
+        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
         <if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''">
-            and kt.skrq &gt;= #{kcEvaluation.startTime}
+            and ev.up_date &gt;= #{kcEvaluation.startTime}
         </if>
         <if test="kcEvaluation.endTime != null and kcEvaluation.endTime != ''">
-            and kt.skrq &lt;= #{kcEvaluation.endTime}
+            and ev.up_date &lt;= #{kcEvaluation.endTime}
         </if>
 
         <if test="kcEvaluation.kcxz != null and kcEvaluation.kcxz != ''">
@@ -29,9 +29,9 @@
         </if>
 
         <if test="kcEvaluation.username != null and kcEvaluation.username != ''">
-            and (ev.upuserid like concat('%',#{kcEvaluation.username},'%') or ev.upuser like concat('%',#{kcEvaluation.username},'%'))
+            and (cu.xm like concat('%',#{kcEvaluation.username},'%') or cu.gh like concat('%',#{kcEvaluation.username},'%'))
         </if>
-        GROUP BY ev.upuserid, ev.upuser, cu.college
+        GROUP BY ev.upuserid, cu.dwh
         ) tk left join
         ( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
         FROM kc_assessuser WHERE 1 = 1
@@ -47,13 +47,13 @@
         SELECT pk.*, au.assess1 as tksf FROM
         (
         SELECT
-        k.id,c.USER as userid, c.cn as username, c.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.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,
         p.source
-        FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
+        FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
         WHERE
         k.id = p.minkcid
-        AND p.upuserid = c.USER
+        AND p.upuserid = c.gh
         <if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''">
             and p.up_date &gt;= #{kcEvaluation.startTime}
         </if>
@@ -61,7 +61,7 @@
             and p.up_date &lt;= #{kcEvaluation.endTime}
         </if>
         <if test="kcEvaluation.username != null and kcEvaluation.username != ''">
-            and (c.cn like concat('%',#{kcEvaluation.username},'%') or c.user like concat('%',#{kcEvaluation.username},'%'))
+            and (c.xm like concat('%',#{kcEvaluation.username},'%') or c.gh like concat('%',#{kcEvaluation.username},'%'))
         </if>
         ) AS pk
         LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
@@ -267,12 +267,12 @@
         SELECT
         tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, tk.source
         FROM (
-        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw,ev.source
+        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw,ev.source
         FROM
         kc_evaluation ev,
         kc_ketangbiao kt,
-        kc_casusers cu
-        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
+        xxhbuser cu
+        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
         <if test="startTime != null and startTime != ''">
             and kt.skrq &gt;= #{startTime}
         </if>
@@ -287,9 +287,9 @@
             and kkdw = #{kkdw}
         </if>
         <if test="szdw != null and szdw != ''">
-            and college = #{szdw}
+            and cu.dwh = #{szdw}
         </if>
-        GROUP BY ev.upuserid, ev.upuser, cu.college
+        GROUP BY ev.upuserid, ev.upuser, cu.dwh
         ) tk,
         ( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
         FROM kc_assessuser WHERE 1 = 1
@@ -306,14 +306,14 @@
         FROM
         (
         SELECT
-        k.id,c.USER as userid, c.cn as username, c.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.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,
         p.source,
         k.kechengbiaoid
-        FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
+        FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
         WHERE
         k.id = p.minkcid
-        AND p.upuserid = c.USER
+        AND p.upuserid = c.gh
         <if test="startTime != null and startTime != ''">
             and p.up_date &gt;= #{startTime}
         </if>