From 99c2cc5c8e9110b7f69f2574ee7ee91367746c22 Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Sun, 14 Sep 2025 21:33:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=BE=BE=E6=A0=87=E9=87=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../srs/comprehensive/domain/TeacherEvaluationStatus.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java
index 1dd2aa0..9d5574f 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java
@@ -73,12 +73,12 @@ public class TeacherEvaluationStatus extends BaseEntity {
     @TableField(exist = false)
     private String isScoreImported;
 
-    /** 备注 */
-    @Excel(name = "备注")
+//    /** 备注 */
+//    @Excel(name = "备注")
     private String remarks;
 
     /** 最后更新时间 */
-    @Excel(name = "最后更新时间")
+//    @Excel(name = "最后更新时间")
     private String lastUpdateTime;
 
     public Long getId() {

From 0639027ac0ea1d2e4684b977203835fe6b12c18b Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Sun, 14 Sep 2025 22:13:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=BE=BE=E6=A0=87=E9=87=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/comprehensive/TeacherEvaluationStatusMapper.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml
index c0107f8..37b2ef7 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/TeacherEvaluationStatusMapper.xml
@@ -62,7 +62,7 @@
             <if test="employeeId != null  and employeeId != ''"> and t.employee_id like concat('%', #{employeeId}, '%')</if>
             <if test="stuYearId != null "> and y.id = #{stuYearId}</if>
         </where>
-        order by d.dept_name, t.name, y.stu_year_name desc
+            order by d.dept_name, t.name, y.stu_year_name desc
     </select>
 
     <select id="selectTeacherEvaluationStatusByCondition" resultMap="TeacherEvaluationStatusResult">
@@ -80,7 +80,7 @@
 
     <!-- 查询学院名称列表，用于下拉框 - 只查询学院级别的部门 -->
     <select id="selectDeptNameList" resultType="java.util.Map">
-        select distinct d.dept_id as value, d.dept_name as label
+        select distinct d.dept_id as value, d.dept_name as label,d.order_num
         from sys_dept d
             inner join cph_teacher t on d.dept_id = t.dept_id
         where d.del_flag = '0' and d.status = '0'