Merge remote-tracking branch 'origin/main'

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() {

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'