yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-09-04 21:05:11 +08:00
parent 12c40081c6
commit 29cbb8ee5c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
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, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwh AS tkdw,kt.skrq SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwmc AS tkdw,kt.skrq
FROM FROM
kc_evaluation ev, kc_evaluation ev,
kc_ketangbiao kt, kc_ketangbiao kt,
@ -27,7 +27,7 @@
and kkdw = #{kcEvaluation.kkdw} and kkdw = #{kcEvaluation.kkdw}
</if> </if>
<if test="kcEvaluation.szdw != null and kcEvaluation.szdw != ''"> <if test="kcEvaluation.szdw != null and kcEvaluation.szdw != ''">
and college = #{kcEvaluation.szdw} and cu.dwmc = #{kcEvaluation.szdw}
</if> </if>
<if test="kcEvaluation.username != null and kcEvaluation.username != ''"> <if test="kcEvaluation.username != null and kcEvaluation.username != ''">

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
View File

@ -900,8 +900,8 @@
select xb.gh as userid,xb.xm as username,tkyq.yskcs as tkyq,count(tk.id) as sjtksl select xb.gh as userid,xb.xm as username,tkyq.yskcs as tkyq,count(tk.id) as sjtksl
from xxhbuser xb from xxhbuser xb
LEFT JOIN (select gh,max(ytkcs) yskcs from kc_export_config_tpkwcqkjzglx where gh = #{userid} and xqxn = #{xnxq}) tkyq on xb.gh = tkyq.gh LEFT JOIN (select gh,max(ytkcs) yskcs from kc_export_config_tpkwcqkjzglx where gh = #{userid} and xqxn = #{xnxq}) tkyq on xb.gh = tkyq.gh
LEFT JOIN kc_tingke tk on xb.gh = tk.userid LEFT JOIN kc_evaluation tk on xb.gh = tk.upuserid
where tk.tingketime >= #{startTime} and tk.tingketime &lt;= concat(#{endTime},' 23:59:59') and tk.userid = #{userid} where tk.up_date >= #{startTime} and tk.up_date &lt;= concat(#{endTime},' 23:59:59') and tk.upuserid = #{userid}
ORDER BY tkyq.yskcs desc ORDER BY tkyq.yskcs desc
</select> </select>