修改bug
This commit is contained in:
parent
273ce5586c
commit
12c40081c6
|
@ -361,7 +361,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
"count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】
|
||||
);
|
||||
qw3.ge("skrq",kcSysConfig.getBxqkssj());//<=
|
||||
qw3.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>=
|
||||
qw3.le("skrq",DateUtil.format(new Date(),"yyyy-MM-dd")+" 23:59:59");//>=
|
||||
List<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
|
||||
if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){
|
||||
rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0));
|
||||
|
@ -448,7 +448,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
|
||||
QueryWrapper<KcKetangbiao> qw3 = new QueryWrapper<>();
|
||||
qw3.ge("kt.skrq",kcSysConfig.getBxqkssj());//<=
|
||||
qw3.le("kt.skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>=
|
||||
qw3.le("kt.skrq",DateUtil.format(new Date(),"yyyy-MM-dd")+" 23:59:59");//>=
|
||||
qw3.eq(StringUtils.isNotBlank(kkdw),"kt.kkdw",kkdw);
|
||||
qw3.eq(StringUtils.isNotBlank(hh),"kt.hh",hh);
|
||||
qw3.eq(StringUtils.isNotBlank(kcxz),"kt.kcxz",kcxz);
|
||||
|
|
|
@ -899,7 +899,7 @@
|
|||
<select id="getUserTingkeInfo" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
|
||||
select xb.gh as userid,xb.xm as username,tkyq.yskcs as tkyq,count(tk.id) as sjtksl
|
||||
from xxhbuser xb
|
||||
LEFT JOIN kc_tkcstj tkyq on xb.gh = tkyq.jgh and xnxq = #{xnxq}
|
||||
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
|
||||
where tk.tingketime >= #{startTime} and tk.tingketime <= concat(#{endTime},' 23:59:59') and tk.userid = #{userid}
|
||||
ORDER BY tkyq.yskcs desc
|
||||
|
|
Loading…
Reference in New Issue