From 3dc1441a8d75b6211270ee83f76b5d87962e33da Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 3 Apr 2023 22:27:35 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B44=E6=9C=883=E6=97=A5=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcKechengbiaoController.java   | 10 ++--
 .../controller/KcKetangbiaoController.java    | 50 ++++++++++++++++---
 2 files changed, 49 insertions(+), 11 deletions(-)

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 29ba24db..b58b4676 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
@@ -81,7 +81,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 	 */
 	@AutoLog(value = "课程管理-主表-添加")
 	@ApiOperation(value="课程管理-主表-添加", notes="课程管理-主表-添加")
-	@RequiresPermissions("ktgl:kc_kechengbiao:add")
+//	@RequiresPermissions("ktgl:kc_kechengbiao:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KcKechengbiao kcKechengbiao) {
 		kcKechengbiaoService.save(kcKechengbiao);
@@ -96,7 +96,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 	 */
 	@AutoLog(value = "课程管理-主表-编辑")
 	@ApiOperation(value="课程管理-主表-编辑", notes="课程管理-主表-编辑")
-	@RequiresPermissions("ktgl:kc_kechengbiao:edit")
+//	@RequiresPermissions("ktgl:kc_kechengbiao:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KcKechengbiao kcKechengbiao) {
 		kcKechengbiaoService.updateById(kcKechengbiao);
@@ -111,7 +111,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 	 */
 	@AutoLog(value = "课程管理-主表-通过id删除")
 	@ApiOperation(value="课程管理-主表-通过id删除", notes="课程管理-主表-通过id删除")
-	@RequiresPermissions("ktgl:kc_kechengbiao:delete")
+//	@RequiresPermissions("ktgl:kc_kechengbiao:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kcKechengbiaoService.removeById(id);
@@ -126,7 +126,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 	 */
 	@AutoLog(value = "课程管理-主表-批量删除")
 	@ApiOperation(value="课程管理-主表-批量删除", notes="课程管理-主表-批量删除")
-	@RequiresPermissions("ktgl:kc_kechengbiao:deleteBatch")
+//	@RequiresPermissions("ktgl:kc_kechengbiao:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kcKechengbiaoService.removeByIds(Arrays.asList(ids.split(",")));
@@ -169,7 +169,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
     * @param response
     * @return
     */
-    @RequiresPermissions("ktgl:kc_kechengbiao:importExcel")
+//    @RequiresPermissions("ktgl:kc_kechengbiao:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, KcKechengbiao.class);
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 5b2345a4..ec08e20a 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
@@ -81,7 +81,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 */
 	@AutoLog(value = "课堂管理-子表-添加")
 	@ApiOperation(value="课堂管理-子表-添加", notes="课堂管理-子表-添加")
-	@RequiresPermissions("ktgl:kc_ketangbiao:add")
+//	@RequiresPermissions("ktgl:kc_ketangbiao:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KcKetangbiao kcKetangbiao) {
 		kcKetangbiaoService.save(kcKetangbiao);
@@ -96,7 +96,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 */
 	@AutoLog(value = "课堂管理-子表-编辑")
 	@ApiOperation(value="课堂管理-子表-编辑", notes="课堂管理-子表-编辑")
-	@RequiresPermissions("ktgl:kc_ketangbiao:edit")
+//	@RequiresPermissions("ktgl:kc_ketangbiao:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KcKetangbiao kcKetangbiao) {
 		kcKetangbiaoService.updateById(kcKetangbiao);
@@ -111,7 +111,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 */
 	@AutoLog(value = "课堂管理-子表-通过id删除")
 	@ApiOperation(value="课堂管理-子表-通过id删除", notes="课堂管理-子表-通过id删除")
-	@RequiresPermissions("ktgl:kc_ketangbiao:delete")
+//	@RequiresPermissions("ktgl:kc_ketangbiao:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kcKetangbiaoService.removeById(id);
@@ -126,7 +126,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 */
 	@AutoLog(value = "课堂管理-子表-批量删除")
 	@ApiOperation(value="课堂管理-子表-批量删除", notes="课堂管理-子表-批量删除")
-	@RequiresPermissions("ktgl:kc_ketangbiao:deleteBatch")
+//	@RequiresPermissions("ktgl:kc_ketangbiao:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kcKetangbiaoService.removeByIds(Arrays.asList(ids.split(",")));
@@ -156,7 +156,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
     * @param request
     * @param kcKetangbiao
     */
-    @RequiresPermissions("ktgl:kc_ketangbiao:exportXls")
+//    @RequiresPermissions("ktgl:kc_ketangbiao:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, KcKetangbiao kcKetangbiao) {
         return super.exportXls(request, kcKetangbiao, KcKetangbiao.class, "课堂管理-子表");
@@ -169,10 +169,48 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
     * @param response
     * @return
     */
-    @RequiresPermissions("ktgl:kc_ketangbiao:importExcel")
+//    @RequiresPermissions("ktgl:kc_ketangbiao:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, KcKetangbiao.class);
     }
 
+	 /**
+	  * 查询统计信息
+	  *
+	  * @param skrq
+	  * @return
+	  */
+	 //@AutoLog(value = "课堂管理-子表-查询统计信息")
+	 @ApiOperation(value="课堂管理-子表-查询统计信息", notes="课堂管理-子表-查询统计信息")
+	 @GetMapping(value = "/getCountList")
+	 public Result<Object> getCountList(String skrq) {
+		 QueryWrapper qw = new QueryWrapper();
+		 qw.select("count(*) - 0 num",//【今日课堂数：总数】
+			"count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum",//【今日课堂数：腾讯】
+			"count( CASE WHEN zbpx = '4' THEN '1' END ) ddktnum",//【今日课堂数：钉钉】
+			"count( CASE WHEN zbpx IN ( '2', '3', '5', '6', '7', '8' ) THEN '1' END ) qtktnum",//【今日课堂数：其他】
+			"count( CASE WHEN date_format( now(), '%H%i' ) > 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"//【上课中】
+		 );
+		 qw.eq("skrq",skrq);
+//		 select
+//		 count(*) - 0 num, -- 【今日课堂数：总数】
+//		 count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum, -- 【今日课堂数：腾讯】
+//		 count( CASE WHEN zbpx = '4' THEN '1' END ) ddktnum, --【今日课堂数：钉钉】
+//		 count( CASE WHEN zbpx IN ( '2', '3', '5', '6', '7', '8' ) THEN '1' END ) qtktnum, -- 【今日课堂数：其他】
+//		 count( CASE WHEN date_format( now(), '%H%i' ) > 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 -- 【上课中】
+//		 FROM ketangbiao
+//		 WHERE skrq = '2023-04-03'
+		 List<java.util.Map<String, Object>> kcKetangbiao = kcKetangbiaoService.listMaps(qw);
+		 if(kcKetangbiao==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(kcKetangbiao);
+	 }
+
+
+
+
 }