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 d450acf7..3da51243 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,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` and kt.skrq >= #{kcEvaluation.startTime} @@ -31,7 +31,7 @@ and (ev.upuserid like concat('%',#{kcEvaluation.username},'%') or ev.upuser like concat('%',#{kcEvaluation.username},'%')) - 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 and p.up_date >= #{kcEvaluation.startTime} @@ -61,7 +61,7 @@ and p.up_date <= #{kcEvaluation.endTime} - 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},'%')) ) 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` and kt.skrq >= #{startTime} @@ -287,9 +287,9 @@ and kkdw = #{kkdw} - and cu.dwh = #{szdw} + and college = #{szdw} - 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 and p.up_date >= #{startTime} @@ -398,20 +398,20 @@ 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 @@