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

修改bug

This commit is contained in:
yangjun 2024-07-02 20:01:43 +08:00
parent 5e1182c405
commit 16e8785b43
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
View File

@ -237,7 +237,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
}else{
evaluationQw.in("kt.xnxq",xqxnSet);
}
evaluationQw.eq("upuser",kcExportConfigTpkwcqkjzglx.getXm());
if(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getXm())){
String userName = kcExportConfigTpkwcqkjzglx.getXm().substring(1,kcExportConfigTpkwcqkjzglx.getXm().length()-1);
evaluationQw.like("upuser",userName);
}
evaluationQw.groupBy("concat(xnxq,'-',upuserid)");
evaluationQw.orderByDesc("kt.skrq");

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
View File

@ -281,7 +281,7 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
QueryWrapper<KcTingke> queryWrapper = QueryGenerator.initQueryWrapper(kcTingke, req.getParameterMap());
queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"tk.tingketime",kcTingke.getStartTime());
queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"tk.tingketime",kcTingke.getEndTime()+" 23:59:59");
queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"cn",kcTingke.getJsxm());
queryWrapper.like(StringUtils.isNotBlank(kcTingke.getJsxm()),"tk.username",kcTingke.getJsxm());
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getSzdw()),"college",kcTingke.getSzdw());
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getTksf()),"sf.assess1",kcTingke.getTksf());
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"tk.kkdw",kcTingke.getKkdw());

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

@ -25,8 +25,10 @@
FROM ( SELECT tk.userid, tk.username, count( tk.id ) sjtksl,
count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl,
college AS tkdw , kt.skrq,kt.kcxz
FROM kc_tingke tk, kc_ketangbiao kt, kc_casusers cu
WHERE tk.kechengbiaoid = kt.id AND tk.userid = cu.`user` AND tk.tingketime > 1
FROM kc_tingke tk
LEFT JOIN kc_ketangbiao kt on tk.kechengbiaoid = kt.id
LEFT JOIN kc_casusers cu on tk.userid = cu.`user`
WHERE tk.tingketime > 1
<if test="kcTingke.startTime!=null and kcTingke.startTime!=''">
AND kt.skrq >= #{kcTingke.startTime}
</if>
@ -115,19 +117,22 @@
</select>
<select id="getTkmxlist" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
SELECT tk.id, tk.user as userid, tk.cn as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq,
SELECT tk.id, tk.userid as userid, tk.username as username, tk.college, sf.assess1 as tksf , tk.kkdw, tk.kcmc, tk.kcxz, tk.skjs, tk.week as zc, tk.hh as jc, tk.tingketime,tk.xnxq,
if(kcb.szkc='1','是','否') as szkc
FROM
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn
FROM kc_ketangbiao k, kc_tingke t, kc_casusers c
WHERE k.id = t.kechengbiaoid AND t.userid = c.USER
( SELECT k.*, t.tingketime, c.USER, c.college, c.cn,
t.username,
t.userid
FROM kc_tingke t
LEFT JOIN kc_ketangbiao k on t.kechengbiaoid = k.id
LEFT JOIN kc_casusers c on t.userid = c.`user`
) tk
LEFT JOIN (
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,max(ytkcs-0) as tkyq from kc_export_config_tpkwcqkjzglx a
LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
and a.xqxn = (select flag1 from kc_sys_config where id = 1)
GROUP BY gh,xm
) sf ON tk.USER = sf.usercode
) sf ON tk.userid = sf.usercode
left join kc_kechengbiao kcb on tk.kechengbiaoid = kcb.id
${ew.customSqlSegment}