2023年6月30日 还原xml

jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml

@@ -5,12 +5,12 @@
         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, cu.dwh AS tkdw
+        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw
         FROM
         kc_evaluation ev,
         kc_ketangbiao kt,
-        xxhbuser cu
-        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
+        kc_casusers cu
+        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
         <if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''">
             and kt.skrq &gt;= #{kcEvaluation.startTime}
         </if>
@@ -31,7 +31,7 @@
         <if test="kcEvaluation.username != null and kcEvaluation.username != ''">
             and (ev.upuserid like concat('%',#{kcEvaluation.username},'%') or ev.upuser like concat('%',#{kcEvaluation.username},'%'))
         </if>
-        GROUP BY ev.upuserid, ev.upuser, cu.dwh
+        GROUP BY ev.upuserid, ev.upuser, cu.college
         ) tk,
         ( 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.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.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.bz,
         p.source
-        FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
+        FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
         WHERE
         k.id = p.minkcid
-        AND p.upuserid = c.gh
+        AND p.upuserid = c.USER
         <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.xm like concat('%',#{kcEvaluation.username},'%') or c.gh like concat('%',#{kcEvaluation.username},'%'))
+            and (c.cn like concat('%',#{kcEvaluation.username},'%') or c.user 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, cu.dwh AS tkdw,ev.source
+        SELECT ev.upuserid, ev.upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, college AS tkdw,ev.source
         FROM
         kc_evaluation ev,
         kc_ketangbiao kt,
-        xxhbuser cu
-        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh
+        kc_casusers cu
+        WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
         <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 cu.dwh = #{szdw}
+            and college = #{szdw}
         </if>
-        GROUP BY ev.upuserid, ev.upuser, cu.dwh
+        GROUP BY ev.upuserid, ev.upuser, cu.college
         ) 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.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.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.bz,
         p.source,
         k.kechengbiaoid
-        FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c
+        FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
         WHERE
         k.id = p.minkcid
-        AND p.upuserid = c.gh
+        AND p.upuserid = c.USER
         <if test="startTime != null and startTime != ''">
             and p.up_date &gt;= #{startTime}
         </if>
@@ -398,20 +398,20 @@
     </select>
     <select id="selectPageAndKcmc" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo">
         select
-            a.*,
-            a.upuserid as tkjgh,
-            a.upuser as tkjsxm,
-            a.evaluationver as pjlblx,
-            kt.kcmc as kcmc,
-            kt.kkdw as kkdw,
-            kt.skjs as skjs,
-            kt.jgh as skjgh,
-            kt.sksj as sksj,
-            kt.skrq as skrq,
-            kt.hh as jieci,
-            kt.skdd as skdd,
-            xu.DWMC as tkdwmc,
-            fen.avgscore as tkpjjg
+        a.*,
+        a.upuserid as tkjgh,
+        a.upuser as tkjsxm,
+        a.evaluationver as pjlblx,
+        kt.kcmc as kcmc,
+        kt.kkdw as kkdw,
+        kt.skjs as skjs,
+        kt.jgh as skjgh,
+        kt.sksj as sksj,
+        kt.skrq as skrq,
+        kt.hh as jieci,
+        kt.skdd as skdd,
+        xu.DWMC as tkdwmc,
+        fen.avgscore as tkpjjg
         from kc_evaluation a
         left join kc_ketangbiao kt on kt.id = a.minkcid
         left join xxhbuser xu on xu.GH = a.upuserid
@@ -421,20 +421,20 @@
 
     <select id="selectPageAndKcmc2" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo2">
         select
-            a.*,
-            a.upuserid as tkjgh,
-            a.upuser as tkjsxm,
-            a.evaluationver as pjlblx,
-            kt.kcmc as kcmc,
-            kt.kkdw as kkdw,
-            kt.skjs as skjs,
-            kt.jgh as skjgh,
-            kt.sksj as sksj,
-            kt.skrq as skrq,
-            kt.hh as jieci,
-            kt.skdd as skdd,
-            xu.DWMC as tkdwmc,
-            fen.avgscore as tkpjjg
+        a.*,
+        a.upuserid as tkjgh,
+        a.upuser as tkjsxm,
+        a.evaluationver as pjlblx,
+        kt.kcmc as kcmc,
+        kt.kkdw as kkdw,
+        kt.skjs as skjs,
+        kt.jgh as skjgh,
+        kt.sksj as sksj,
+        kt.skrq as skrq,
+        kt.hh as jieci,
+        kt.skdd as skdd,
+        xu.DWMC as tkdwmc,
+        fen.avgscore as tkpjjg
         from kc_evaluation a
         left join kc_ketangbiao kt on kt.id = a.minkcid
         left join xxhbuser xu on xu.GH = a.upuserid
@@ -443,18 +443,18 @@
     </select>
     <select id="queryPkZuJiPage" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
         SELECT
-            a.upuserid,
-            ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq,
-            DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian,
-            a.id AS evaluationid,
-            a.evaluationver,
-            evs.ketangbiaoid,
-            ea.score,
-            a.source,
-            a.minkcid,
-            kt.kcmc,
-            kt.skjs,
-            kt.kkdw
+        a.upuserid,
+        ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq,
+        DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian,
+        a.id AS evaluationid,
+        a.evaluationver,
+        evs.ketangbiaoid,
+        ea.score,
+        a.source,
+        a.minkcid,
+        kt.kcmc,
+        kt.skjs,
+        kt.kkdw
         FROM
         kc_evaluation a
         join kc_evaluations evs on a.id = evs.evaluationid