From 47a8f5c20d9b9f2b8f6de9b0e90d73733750970c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 16 May 2024 21:27:55 +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

---
 .../kc/ktgl/controller/KcKechengbiaoController.java        | 7 ++-----
 .../modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml     | 1 +
 .../java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java  | 2 +-
 3 files changed, 4 insertions(+), 6 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 5a52ad3a..9183f801 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
@@ -251,12 +251,12 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 		 if(StringUtils.equals("0",kcKechengbiao.getCheckType())){//当前学年
 			 queryWrapper.eq("xqxn",kcSysConfig.getFlag1());
 		 }else{//历史学年
-			 queryWrapper.ne("xqxn",kcSysConfig.getFlag1());
+//			 queryWrapper.ne("xqxn",kcSysConfig.getFlag1());
 		 }
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 queryWrapper.eq("jgh",sysUser.getUsername());
 		 queryWrapper.eq("flag","0");
-		 queryWrapper.orderByAsc("kcmc,week");
+		 queryWrapper.orderByDesc("xqxn");
 		 Page<KcKechengbiao> page = new Page<KcKechengbiao>(pageNo, pageSize);
 		 IPage<KcKechengbiao> pageList = kcKechengbiaoService.getKechengbiaolist(page, queryWrapper);
 		 return Result.OK(pageList);
@@ -289,9 +289,6 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
 		 kcKechengbiaoQueryWrapper.eq("xqxn",xqxn);
 		 kcKechengbiaoQueryWrapper.last("limit 1");
 		 KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
-		 if(kcKechengbiao==null) {
-			 return Result.error("未找到对应数据");
-		 }
 		 return Result.OK(kcKechengbiao);
 	 }
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
index 48fdcb00..b21eec4b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
@@ -178,6 +178,7 @@
         kcxz,
         szkc,
         xqxn
+        ORDER BY xqxn desc
     </select>
 
     <select id="getStudentKclist" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
index 9cadba6f..a9858c54 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
@@ -284,7 +284,7 @@ public class KcEvaluation implements Serializable {
     private java.lang.Integer kkdwid;
     /**课程表id*/
     @TableField(exist = false)
-    private java.lang.Integer kechengbiaoid;
+    private java.lang.String kechengbiaoid;
     /**听课次数*/
     @TableField(exist = false)
     private java.lang.Integer tingkecishu;