From 664e6e96a3e5685cdfc9f8ed3c34f450796c161a Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 26 Jul 2023 08:49:24 +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/KcKetangSuibiController.java | 2 +- .../kcKetangSuibi/entity/KcKetangSuibi.java | 12 +++++ .../mapper/xml/KcKetangSuibiMapper.xml | 9 +++- .../controller/KcZzThpjbController.java | 1 + .../controller/KcZzXstkbController.java | 3 +- .../controller/KcZzYbtkbController.java | 3 +- .../controller/KcKetangbiaoController.java | 51 ++++++++++++++----- .../modules/kc/ktgl/entity/KcKetangbiao.java | 2 + .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 4 ++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 48 +++++++++++++++++ .../kc/ktgl/service/IKcKetangbiaoService.java | 4 ++ .../service/impl/KcKetangbiaoServiceImpl.java | 10 ++++ 12 files changed, 132 insertions(+), 17 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java index a78f0d47..bede44d9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java @@ -52,7 +52,7 @@ public class KcKetangSuibiController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcKetangSuibi, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcKetangSuibi, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = kcKetangSuibiService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java index b950023d..a89a22c0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java @@ -3,6 +3,7 @@ package org.jeecg.modules.kc.kcKetangSuibi.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -63,4 +64,15 @@ public class KcKetangSuibi implements Serializable { @Excel(name = "笔记内容", width = 15) @ApiModelProperty(value = "笔记内容") private java.lang.String notes; + + @TableField(exist = false) + private String kcmc; + @TableField(exist = false) + private String skjs; + @TableField(exist = false) + private String skdd; + @TableField(exist = false) + private String skrq; + @TableField(exist = false) + private String hh; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml index c051a008..8383062c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml @@ -1,5 +1,12 @@ - + + + \ No newline at end of file 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 e37a24c1..111cdf5a 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 @@ -248,6 +248,7 @@ public class KcZzThpjbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); + KcZzThpjbPar.setKcbh(KcKetangbiao.getKcbh()); newList.add(KcZzThpjbPar); KcTingke kcTingke = new KcTingke(); kcTingke.setTingketime(DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd")); 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 48163ffa..15d0f2ab 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 @@ -230,8 +230,9 @@ public class KcZzXstkbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ - newList.add(KcZzXstkbPar); KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); + KcZzXstkbPar.setKcbh(KcKetangbiao.getKcbh()); + newList.add(KcZzXstkbPar); KcTingke kcTingke = new KcTingke(); kcTingke.setTingketime(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 a54bed52..699b2dd4 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 @@ -248,8 +248,9 @@ public class KcZzYbtkbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ - newList.add(KcZzYbtkbPar); KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); + KcZzYbtkbPar.setKcbh(KcKetangbiao.getKcbh()); + newList.add(KcZzYbtkbPar); KcTingke kcTingke = new KcTingke(); kcTingke.setTingketime(DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd")); 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 58be2b61..14d88550 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 @@ -398,19 +398,44 @@ public class KcKetangbiaoController extends JeecgController 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); + + + + QueryWrapper qw3 = new QueryWrapper<>(); + qw3.ge("kt.skrq",getBxqStartTime());//<= + qw3.le("kt.skrq",skrq);//>= + qw3.eq(StringUtils.isNotBlank(kkdw),"kt.kkdw",kkdw); + qw3.eq(StringUtils.isNotBlank(hh),"kt.hh",hh); + qw3.eq(StringUtils.isNotBlank(kcxz),"kt.kcxz",kcxz); + qw3.eq(StringUtils.isNotBlank(ywTime),"kt.skrq",ywTime); + qw3.apply(StringUtils.isNotBlank(ywmc),"(kt.skjs like '%"+ywmc+"%' or kt.kcmc like '%"+ywmc+"%') "); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcKetangbiaoService.indexYkktzsPage(page, qw3); + +// //查询第三句-已开课堂总数 +// 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); +// List> list = kcKetangbiao3List.getRecords(); +// for(int i=0;i map = list.get(i); +// String ketangbiaoid = map.get("id")+""; +// KcKetangbiao kcKetangbiao = new KcKetangbiao(); +// kcKetangbiao.setId(ketangbiaoid); +// KcKetangbiao kcKetangbiaoPar = kcKetangbiaoService.getScoreById(kcKetangbiao); +// if(kcKetangbiaoPar!=null&&StringUtils.isNotBlank(kcKetangbiaoPar.getScore())){ +// map.put("score",kcKetangbiaoPar.getScore()); +// } +// } + return Result.OK(pageList); } /** 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 211c45d1..3507a590 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 @@ -290,5 +290,7 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private boolean searchByNowXqxn; + @TableField(exist = false) + private String score; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 3a313041..21aa3273 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -52,4 +52,8 @@ public interface KcKetangbiaoMapper extends BaseMapper { List getKtbjList(KcKetangbiao kcKetangbiao); IPage fundAllPjjgList(Page page, @Param(Constants.ENTITY) QueryWrapper queryWrapper); + + KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao); + + IPage indexYkktzsPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 b5c0136c..9ae1e6e8 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 @@ -563,4 +563,52 @@ ORDER BY a.create_time desc + + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 1de7c96a..3db9f3ad 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -54,4 +54,8 @@ public interface IKcKetangbiaoService extends IService { List getKtbjList(KcKetangbiao kcKetangbiao); IPage fundAllPjjgList(Page page, QueryWrapper queryWrapper); + + KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao); + + IPage indexYkktzsPage(Page page, QueryWrapper qw3); } 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 13a0fc85..9a4d4dfc 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 @@ -106,4 +106,14 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl fundAllPjjgList(Page page, QueryWrapper queryWrapper) { return baseMapper.fundAllPjjgList(page,queryWrapper); } + + @Override + public KcKetangbiao getScoreById(KcKetangbiao kcKetangbiao) { + return baseMapper.getScoreById(kcKetangbiao); + } + + @Override + public IPage indexYkktzsPage(Page page, QueryWrapper qw3) { + return baseMapper.indexYkktzsPage(page,qw3); + } }