2023年6月30日 还原xml

This commit is contained in:
bai 2023-06-30 00:00:50 +08:00
parent aa5b798824
commit 771dea42a9
1 changed files with 56 additions and 56 deletions

View File

@ -5,12 +5,12 @@
SELECT SELECT
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw
FROM ( 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 FROM
kc_evaluation ev, kc_evaluation ev,
kc_ketangbiao kt, kc_ketangbiao kt,
xxhbuser cu kc_casusers cu
WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
<if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''"> <if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''">
and kt.skrq &gt;= #{kcEvaluation.startTime} and kt.skrq &gt;= #{kcEvaluation.startTime}
</if> </if>
@ -31,7 +31,7 @@
<if test="kcEvaluation.username != null and kcEvaluation.username != ''"> <if test="kcEvaluation.username != null and kcEvaluation.username != ''">
and (ev.upuserid like concat('%',#{kcEvaluation.username},'%') or ev.upuser like concat('%',#{kcEvaluation.username},'%')) and (ev.upuserid like concat('%',#{kcEvaluation.username},'%') or ev.upuser like concat('%',#{kcEvaluation.username},'%'))
</if> </if>
GROUP BY ev.upuserid, ev.upuser, cu.dwh GROUP BY ev.upuserid, ev.upuser, cu.college
) tk, ) tk,
( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq ( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
FROM kc_assessuser WHERE 1 = 1 FROM kc_assessuser WHERE 1 = 1
@ -47,13 +47,13 @@
SELECT pk.*, au.assess1 as tksf FROM SELECT pk.*, au.assess1 as tksf FROM
( (
SELECT 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, k.bz,
p.source p.source
FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
WHERE WHERE
k.id = p.minkcid k.id = p.minkcid
AND p.upuserid = c.gh AND p.upuserid = c.USER
<if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''"> <if test="kcEvaluation.startTime != null and kcEvaluation.startTime != ''">
and p.up_date &gt;= #{kcEvaluation.startTime} and p.up_date &gt;= #{kcEvaluation.startTime}
</if> </if>
@ -61,7 +61,7 @@
and p.up_date &lt;= #{kcEvaluation.endTime} and p.up_date &lt;= #{kcEvaluation.endTime}
</if> </if>
<if test="kcEvaluation.username != null and kcEvaluation.username != ''"> <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> </if>
) AS pk ) AS pk
LEFT JOIN kc_assessuser au ON pk.userid = au.usercode LEFT JOIN kc_assessuser au ON pk.userid = au.usercode
@ -267,12 +267,12 @@
SELECT SELECT
tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, tk.source tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw, tk.source
FROM ( 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 FROM
kc_evaluation ev, kc_evaluation ev,
kc_ketangbiao kt, kc_ketangbiao kt,
xxhbuser cu kc_casusers cu
WHERE ev.minkcid = kt.id AND ev.upuserid = cu.gh WHERE ev.minkcid = kt.id AND ev.upuserid = cu.`user`
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and kt.skrq &gt;= #{startTime} and kt.skrq &gt;= #{startTime}
</if> </if>
@ -287,9 +287,9 @@
and kkdw = #{kkdw} and kkdw = #{kkdw}
</if> </if>
<if test="szdw != null and szdw != ''"> <if test="szdw != null and szdw != ''">
and cu.dwh = #{szdw} and college = #{szdw}
</if> </if>
GROUP BY ev.upuserid, ev.upuser, cu.dwh GROUP BY ev.upuserid, ev.upuser, cu.college
) tk, ) tk,
( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq ( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq
FROM kc_assessuser WHERE 1 = 1 FROM kc_assessuser WHERE 1 = 1
@ -306,14 +306,14 @@
FROM FROM
( (
SELECT 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, k.bz,
p.source, p.source,
k.kechengbiaoid k.kechengbiaoid
FROM kc_ketangbiao k, kc_evaluation p, xxhbuser c FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c
WHERE WHERE
k.id = p.minkcid k.id = p.minkcid
AND p.upuserid = c.gh AND p.upuserid = c.USER
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and p.up_date &gt;= #{startTime} and p.up_date &gt;= #{startTime}
</if> </if>
@ -398,20 +398,20 @@
</select> </select>
<select id="selectPageAndKcmc" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo"> <select id="selectPageAndKcmc" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo">
select select
a.*, a.*,
a.upuserid as tkjgh, a.upuserid as tkjgh,
a.upuser as tkjsxm, a.upuser as tkjsxm,
a.evaluationver as pjlblx, a.evaluationver as pjlblx,
kt.kcmc as kcmc, kt.kcmc as kcmc,
kt.kkdw as kkdw, kt.kkdw as kkdw,
kt.skjs as skjs, kt.skjs as skjs,
kt.jgh as skjgh, kt.jgh as skjgh,
kt.sksj as sksj, kt.sksj as sksj,
kt.skrq as skrq, kt.skrq as skrq,
kt.hh as jieci, kt.hh as jieci,
kt.skdd as skdd, kt.skdd as skdd,
xu.DWMC as tkdwmc, xu.DWMC as tkdwmc,
fen.avgscore as tkpjjg fen.avgscore as tkpjjg
from kc_evaluation a from kc_evaluation a
left join kc_ketangbiao kt on kt.id = a.minkcid left join kc_ketangbiao kt on kt.id = a.minkcid
left join xxhbuser xu on xu.GH = a.upuserid left join xxhbuser xu on xu.GH = a.upuserid
@ -421,20 +421,20 @@
<select id="selectPageAndKcmc2" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo2"> <select id="selectPageAndKcmc2" resultType="org.jeecg.modules.kc.statistics.KcEvaluationVo2">
select select
a.*, a.*,
a.upuserid as tkjgh, a.upuserid as tkjgh,
a.upuser as tkjsxm, a.upuser as tkjsxm,
a.evaluationver as pjlblx, a.evaluationver as pjlblx,
kt.kcmc as kcmc, kt.kcmc as kcmc,
kt.kkdw as kkdw, kt.kkdw as kkdw,
kt.skjs as skjs, kt.skjs as skjs,
kt.jgh as skjgh, kt.jgh as skjgh,
kt.sksj as sksj, kt.sksj as sksj,
kt.skrq as skrq, kt.skrq as skrq,
kt.hh as jieci, kt.hh as jieci,
kt.skdd as skdd, kt.skdd as skdd,
xu.DWMC as tkdwmc, xu.DWMC as tkdwmc,
fen.avgscore as tkpjjg fen.avgscore as tkpjjg
from kc_evaluation a from kc_evaluation a
left join kc_ketangbiao kt on kt.id = a.minkcid left join kc_ketangbiao kt on kt.id = a.minkcid
left join xxhbuser xu on xu.GH = a.upuserid left join xxhbuser xu on xu.GH = a.upuserid
@ -443,18 +443,18 @@
</select> </select>
<select id="queryPkZuJiPage" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation"> <select id="queryPkZuJiPage" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
SELECT SELECT
a.upuserid, a.upuserid,
ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq, ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq,
DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian, DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian,
a.id AS evaluationid, a.id AS evaluationid,
a.evaluationver, a.evaluationver,
evs.ketangbiaoid, evs.ketangbiaoid,
ea.score, ea.score,
a.source, a.source,
a.minkcid, a.minkcid,
kt.kcmc, kt.kcmc,
kt.skjs, kt.skjs,
kt.kkdw kt.kkdw
FROM FROM
kc_evaluation a kc_evaluation a
join kc_evaluations evs on a.id = evs.evaluationid join kc_evaluations evs on a.id = evs.evaluationid