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 56a94ba6..207a1471 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 @@ -199,6 +199,7 @@ public class KcKetangbiaoController extends JeecgController getCountList(String skrq) { Map rmap = Maps.newHashMap(); + String startTime = "2023-02-19"; //第一句-今日课堂 QueryWrapper qw = new QueryWrapper(); qw.select("count(*) - 0 num",//【今日课堂数:总数】 @@ -229,12 +230,21 @@ public class KcKetangbiaoController extends JeecgController hhjs THEN 1 END ) xkktnum",//【下课课堂数】 "count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】 ); - qw3.ge("skrq","2023-02-19");//<= + qw3.ge("skrq",startTime);//<= qw3.le("skrq",skrq);//>= List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){ rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0)); } + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + kcKetangbiao.setStartTime(startTime); + kcKetangbiao.setEndTime(skrq); + List> listTjIndex = kcKetangbiaoService.getIndexYkktstj(kcKetangbiao); + if(listTjIndex != null && !listTjIndex.isEmpty()){ + rmap.put("yiKaiKeTangNew",listTjIndex.get(0)); + } + + return Result.OK(rmap); } 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 035ce6c1..c4d966e0 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 @@ -251,4 +251,9 @@ public class KcKetangbiao implements Serializable { private java.lang.String userid; @TableField(exist = false) private java.lang.Integer isdeleted; + + @TableField(exist = false) + private String startTime; + @TableField(exist = false) + private String endTime; } 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 26753c9e..956a5d26 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 @@ -24,4 +24,5 @@ public interface KcKetangbiaoMapper extends BaseMapper { List> selectJrTkCount(String skrq); + List> getIndexYkktstj(KcKetangbiao kcKetangbiao); } 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 0974ac6c..9b6af39a 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 @@ -18,6 +18,21 @@ + + +