修改bug
This commit is contained in:
parent
2e9b941b8c
commit
4b9964f6d7
|
|
@ -777,6 +777,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
// queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
||||
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
||||
IPage<KcKetangbiao> pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao);
|
||||
log.info("-----videoScreenshotByJsbh-----pageList--------------{},{}",pageList.getRecords().size(),pageList.getRecords());
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh
|
||||
left join kc_jieci jc on ktb.hh = jc.jieci
|
||||
left join kc_kechengbiao kcb on kcb.kcmc = ktb.kcmc and kcb.kcxz = ktb.kcxz and kcb.skjs = ktb.skjs and kcb.skdd=ktb.skdd and kcb.kkdw = ktb.kkdw and kcb.kcbh = ktb.kcbh and kcb.id = ktb.kechengbiaoid
|
||||
left join (select distinct tkxx.xm,tkxx.kcmc,concat(substring(tkxx.skrq,1,4),'-',substring(tkxx.skrq,5,2),'-',substring(tkxx.skrq,7,2)) as skrq,tkxx.skjs,tkxx.tksy from xxhbtkxx tkxx where tkxx.tklx != '3' and tkxx.skrq is not null) tkxx
|
||||
left join (select distinct tkxx.xm,tkxx.kcmc,DATE_FORMAT(tkxx.SKRQ,'%Y-%m-%d') as skrq,tkxx.skjs,tkxx.tksy from xxhbtkxx tkxx where tkxx.tklx != '3' and tkxx.skrq is not null) tkxx
|
||||
on ktb.kcmc =tkxx.kcmc and ktb.skrq = tkxx.skrq and ktb.skdd=tkxx.skjs and ktb.skjs = tkxx.xm
|
||||
left join kc_kkdw kkdw on ktb.kkdw = kkdw.kkdw
|
||||
<where>
|
||||
|
|
@ -101,9 +101,9 @@
|
|||
<if test="kcKetangbiao.jzwh!=null and kcKetangbiao.jzwh!=''">
|
||||
and jxljbxx.jzwh = #{kcKetangbiao.jzwh}
|
||||
</if>
|
||||
<if test="kcKetangbiao.sftkb!=null and kcKetangbiao.sftkb!=''">
|
||||
and IF(tkxx.kcmc is null,'0','1') = 0
|
||||
</if>
|
||||
<!-- <if test="kcKetangbiao.sftkb!=null and kcKetangbiao.sftkb!=''">-->
|
||||
<!-- and IF(tkxx.kcmc is null,'0','1') = 0-->
|
||||
<!-- </if>-->
|
||||
<if test="kcKetangbiao.bmdId !=null and kcKetangbiao.bmdId !=''">
|
||||
and (ktb.kcmc,ktb.skjs,ktb.skdd,ktb.hh,ktb.skrq) in (select kcmc,skjs,skdd,hh,skrq from kc_tingke_bmd_kcxx where bmd_id in (${kcKetangbiao.bmdId}))
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package org.jeecg.modules.kc.ktgl.service.impl;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.UnavailableSecurityManagerException;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
|
|
@ -57,7 +58,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
|
|||
if(bmdId.contains(",")){
|
||||
bmdId = bmdId.substring(0,bmdId.length()-1);
|
||||
}
|
||||
kcKetangbiao.setBmdId(bmdId);
|
||||
if(StringUtils.isNotBlank(bmdId)){
|
||||
kcKetangbiao.setBmdId(bmdId);
|
||||
}
|
||||
return baseMapper.getKclblist(page,kcKetangbiao);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -690,7 +690,7 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
|
|||
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||
// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
|
||||
kcWechatSendLog.setYtkcs(content);
|
||||
sendWxmessage(kcWechatSendLog);
|
||||
// sendWxmessage(kcWechatSendLog);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||
// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
|
||||
kcWechatSendLog.setYtkcs(zyDbtx.getContent());
|
||||
sendWxmessage(kcWechatSendLog);
|
||||
// sendWxmessage(kcWechatSendLog);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -343,7 +343,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
KcWechatSendLog kcWechatSendLog = new KcWechatSendLog();
|
||||
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||
kcWechatSendLog.setYtkcs(zyDbtx.getContent());
|
||||
sendWxmessage(kcWechatSendLog);
|
||||
// sendWxmessage(kcWechatSendLog);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -496,7 +496,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||
// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
|
||||
kcWechatSendLog.setYtkcs(content);
|
||||
sendWxmessage(kcWechatSendLog);
|
||||
// sendWxmessage(kcWechatSendLog);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -938,7 +938,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
// kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
|
||||
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||
kcWechatSendLog.setYtkcs(zyDbtx.getContent());
|
||||
sendWxmessage(kcWechatSendLog);
|
||||
// sendWxmessage(kcWechatSendLog);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
System.out.println("------------------2--------------------------"+containerId);
|
||||
roles = "teacher";//教师角色
|
||||
userIdentity = 2;//允许进入后台
|
||||
}else if(StringUtils.indexOf(containerId,"ou=bzks") != -1){
|
||||
}else if(StringUtils.indexOf(containerId,"ou=bzks") != -1 || StringUtils.indexOf(containerId,"ou=yjs") != -1){
|
||||
System.out.println("------------------3--------------------------"+containerId);
|
||||
roles = "student";//学生角色
|
||||
userIdentity = 1;//不允许进入后台
|
||||
|
|
|
|||
|
|
@ -318,9 +318,9 @@ jodconverter:
|
|||
# 使用本机作为转换服务器，如果使用其它主机作为转换服务器，则需要配置remote，
|
||||
# 请参考 org.jodconverter.boot.autoconfigure.JodConverterRemoteProperties
|
||||
local:
|
||||
enabled: false
|
||||
enabled: true
|
||||
# 为了避免不必要的兼容问题，需要配置本机的LibreOffice安装目录
|
||||
office-home: C:\Program Files\LibreOffice
|
||||
office-home: E:\BLXC\APPLICATION\libreoffice
|
||||
# 配置LibreOffice的服务端口，以逗号分隔，每个端口为一个独立的进程
|
||||
port-numbers: 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
|
||||
# 配置最大的任务队列
|
||||
|
|
|
|||
Loading…
Reference in New Issue