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
- and kt.skrq >= #{kcEvaluation.startTime}
+ and ev.up_date >= #{kcEvaluation.startTime}
- and kt.skrq <= #{kcEvaluation.endTime}
+ and ev.up_date <= #{kcEvaluation.endTime}
@@ -29,9 +29,9 @@
- 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},'%'))
- 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
and p.up_date >= #{kcEvaluation.startTime}
@@ -61,7 +61,7 @@
and p.up_date <= #{kcEvaluation.endTime}
- 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},'%'))
) 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
and kt.skrq >= #{startTime}
@@ -287,9 +287,9 @@
and kkdw = #{kkdw}
- and college = #{szdw}
+ and cu.dwh = #{szdw}
- 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
and p.up_date >= #{startTime}