From 4af5d4578abf21dacfcf02d3495d3bf8275c6260 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 20 Jul 2023 22:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcZzThpjbController.java | 4 +-- .../controller/KcZzXstkbController.java | 4 +-- .../controller/KcZzYbtkbController.java | 4 +-- .../controller/KcKechengbiaoController.java | 5 +-- .../controller/KcKetangbiaoController.java | 24 +++++++++++-- .../modules/kc/ktgl/entity/KcKetangbiao.java | 4 +++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 35 ++++++++++++++++++- 7 files changed, 68 insertions(+), 12 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java index d0ad9787..e37a24c1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java @@ -226,7 +226,7 @@ public class KcZzThpjbController extends JeecgController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); +// queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); queryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc()); queryWrapper.eq("skjs",KcZzThpjbPar.getSkjs()); queryWrapper.eq("skdd",KcZzThpjbPar.getSkdd()); @@ -240,7 +240,7 @@ public class KcZzThpjbController extends JeecgController"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); +// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); kcKetangbiaoQueryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc()); kcKetangbiaoQueryWrapper.eq("skjs",KcZzThpjbPar.getSkjs()); kcKetangbiaoQueryWrapper.eq("skdd",KcZzThpjbPar.getSkdd()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java index 3dab554c..48163ffa 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java @@ -209,7 +209,7 @@ public class KcZzXstkbController extends JeecgController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh()); +// queryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh()); queryWrapper.eq("kcmc",KcZzXstkbPar.getKcmc()); queryWrapper.eq("skjs",KcZzXstkbPar.getSkjs()); queryWrapper.eq("skdd",KcZzXstkbPar.getSkdd()); @@ -223,7 +223,7 @@ public class KcZzXstkbController extends JeecgController"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh()); +// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh()); kcKetangbiaoQueryWrapper.eq("kcmc",KcZzXstkbPar.getKcmc()); kcKetangbiaoQueryWrapper.eq("skdd",KcZzXstkbPar.getSkdd()); kcKetangbiaoQueryWrapper.like("skrq", DateUtil.format(KcZzXstkbPar.getSksj(),"yyyy-MM-dd")); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java index 7d6286ff..a54bed52 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java @@ -227,7 +227,7 @@ public class KcZzYbtkbController extends JeecgController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); +// queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); queryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc()); queryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs()); queryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd()); @@ -241,7 +241,7 @@ public class KcZzYbtkbController extends JeecgController"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); +// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh()); kcKetangbiaoQueryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc()); kcKetangbiaoQueryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd()); kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd")); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index 39b93dac..d2a535bf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -93,9 +93,10 @@ public class KcKechengbiaoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",kcKechengbiao, req.getParameterMap()); if(StringUtils.isNotBlank(kcKechengbiao.getSearchInput())){ - queryWrapper.apply(String.format("(kcmc like CONCAT('%',%s,'%') or skjs like CONCAT('%',%s,'%'))",kcKechengbiao.getSearchInput())); + queryWrapper.like("kcmc",kcKechengbiao.getSearchInput()); +// queryWrapper.apply("(kcmc like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%') or skjs like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%'))"); } - queryWrapper.apply(StringUtils.isNotBlank(kcKechengbiao.getYwcol())," length(kcbh)<25"); +// queryWrapper.apply(StringUtils.isNotBlank(kcKechengbiao.getYwcol())," length(kcbh)<25"); Page page = new Page(pageNo, pageSize); IPage pageList = kcKechengbiaoService.listGroupBy(page, queryWrapper); return Result.OK(pageList); 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 2002d8c2..aadd6f0d 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 @@ -341,12 +341,18 @@ public class KcKetangbiaoController extends JeecgController ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { + public Result ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) { //查询第三句-已开课堂总数 QueryWrapper qw3 = new QueryWrapper(); qw3.select("*"); qw3.ge("skrq",getBxqStartTime());//<= qw3.le("skrq",skrq);//>= + qw3.eq(StringUtils.isNotBlank(kkdw),"kkdw",kkdw); + qw3.eq(StringUtils.isNotBlank(hh),"hh",hh); + qw3.eq(StringUtils.isNotBlank(kcxz),"kcxz",kcxz); + qw3.eq(StringUtils.isNotBlank(ywTime),"skrq",ywTime); + qw3.apply(StringUtils.isNotBlank(ywmc),"(skjs like '%"+ywmc+"%' or kcmc like '%"+ywmc+"%') "); Page> page = new Page<>(pageNo, pageSize); IPage> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3); return Result.OK(kcKetangbiao3List); @@ -360,11 +366,17 @@ public class KcKetangbiaoController extends JeecgController ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { + public Result ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(getBxqStartTime()); kcKetangbiao.setEndTime(skrq); + kcKetangbiao.setKkdw(kkdw); + kcKetangbiao.setHh(hh); + kcKetangbiao.setKcxz(kcxz); + kcKetangbiao.setYwmc(ywmc); + kcKetangbiao.setYwTime(ywTime); Page> page = new Page<>(pageNo, pageSize); IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao); return Result.OK(listTjIndex); @@ -378,11 +390,17 @@ public class KcKetangbiaoController extends JeecgController ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { + public Result ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(getBxqStartTime()); kcKetangbiao.setEndTime(skrq); + kcKetangbiao.setKkdw(kkdw); + kcKetangbiao.setHh(hh); + kcKetangbiao.setKcxz(kcxz); + kcKetangbiao.setYwmc(ywmc); + kcKetangbiao.setYwTime(ywTime); Page> page = new Page<>(pageNo, pageSize); IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao); return Result.OK(listTjIndex); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 422aece0..18dd86ea 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -256,6 +256,8 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private java.lang.String ywmc; @TableField(exist = false) + private java.lang.String ywTime; + @TableField(exist = false) private java.lang.String ywskxs; @TableField(exist = false) private java.lang.String sfyy; @@ -283,5 +285,7 @@ public class KcKetangbiao implements Serializable { private String sfyzhjs; @TableField(exist = false) private String jzwh; + @TableField(exist = false) + private String szkc; } 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 f72f5470..3aff3323 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 @@ -35,13 +35,14 @@