From a9f3fa58fd62ac63579740789c747aed14068f10 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 6 May 2024 15:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcKechengbiaoController.java   | 27 +++++++++++++++++++
 .../modules/kc/ktgl/entity/KcKechengbiao.java |  2 ++
 .../service/impl/KcKetangbiaoServiceImpl.java |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)

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 d2a535bf..f29be00e 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
@@ -12,9 +12,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
+import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
 import org.jeecg.modules.kc.kcSzkc.entity.KcSzkc;
 import org.jeecg.modules.kc.kcSzkc.service.IKcSzkcService;
 import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
@@ -57,6 +61,8 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 	private IKcKechengbiaoService kcKechengbiaoService;
 	 @Autowired
 	 private IKcSzkcService kcSzkcService;
+	 @Autowired
+	 private IKcSysConfigService kcSysConfigService;
 	/**
 	 * 分页列表查询
 	 *
@@ -234,4 +240,25 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
         return super.importExcel(request, response, KcKechengbiao.class);
     }
 
+	 @ApiOperation(value="课程管理-主表-分页列表查询", notes="课程管理-主表-分页列表查询")
+	 @GetMapping(value = "/getKechengbiaolist")
+	 public Result<IPage<KcKechengbiao>> getKechengbiaolist(KcKechengbiao kcKechengbiao,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		 QueryWrapper<KcKechengbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKechengbiao, req.getParameterMap());
+		 KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+		 if(StringUtils.equals("0",kcKechengbiao.getCheckType())){//当前学年
+			 queryWrapper.eq("xqxn",kcSysConfig.getFlag1());
+		 }else{//历史学年
+			 queryWrapper.ne("xqxn",kcSysConfig.getFlag1());
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 queryWrapper.eq("jgh",sysUser.getUsername());
+		 queryWrapper.orderByAsc("kcmc,week");
+		 Page<KcKechengbiao> page = new Page<KcKechengbiao>(pageNo, pageSize);
+		 IPage<KcKechengbiao> pageList = kcKechengbiaoService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
index a36f48f8..38c0ba0c 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java
@@ -252,5 +252,7 @@ public class KcKechengbiao implements Serializable {
     private java.lang.String ts;
     @TableField(exist = false)
     private java.lang.String ywcol;
+    @TableField(exist = false)
+    private java.lang.String checkType;
 
 }
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 116ef0bf..17e34184 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
@@ -37,7 +37,7 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
     @Override
     public IPage<KcKetangbiao> getKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //获取当前用户是否有白名单权限 
+        //获取当前用户是否有白名单权限
         QueryWrapper<KcTingkeBmd> kcTingkeBmdQueryWrapper = new QueryWrapper<>();
         kcTingkeBmdQueryWrapper.eq("jgh",user.getUsername());
         List<KcTingkeBmd> list = kcTingkeBmdMapper.selectList(kcTingkeBmdQueryWrapper);