diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 5fe46d81..da0dc68b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -777,6 +777,7 @@ public class KcKetangbiaoController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao); + log.info("-----videoScreenshotByJsbh-----pageList--------------{},{}",pageList.getRecords().size(),pageList.getRecords()); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 0a02c327..4bb0cb7e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -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 @@ -101,9 +101,9 @@ and jxljbxx.jzwh = #{kcKetangbiao.jzwh} - - and IF(tkxx.kcmc is null,'0','1') = 0 - + + + 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})) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 08f6a7b2..cf0bd11d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -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 kcWechatSendLog.setOpenid(xxhbbks.getXh()); // kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 kcWechatSendLog.setYtkcs(content); - sendWxmessage(kcWechatSendLog); +// sendWxmessage(kcWechatSendLog); } catch (Exception e) { e.printStackTrace(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index e76b5aea..1a49348f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -168,7 +168,7 @@ public class ZyInfoController extends JeecgController { 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 { 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 { 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 { // kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号 kcWechatSendLog.setOpenid(xxhbbks.getXh()); kcWechatSendLog.setYtkcs(zyDbtx.getContent()); - sendWxmessage(kcWechatSendLog); +// sendWxmessage(kcWechatSendLog); } catch (Exception e) { e.printStackTrace(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 733d759d..7e45c0d9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -575,7 +575,7 @@ public class SysUserServiceImpl extends ServiceImpl 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;//不允许进入后台 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index bdb8ced0..8e4bb013 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -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 # 配置最大的任务队列