Administrator 1 år sedan
förälder
incheckning
4f70272af0

+ 10 - 10
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordLeave.java

@@ -43,8 +43,8 @@ public class RecordLeave extends BaseEntity
     private Long classId;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String clasName;
+    @Excel(name = "班级名称")
+    private String className;
 
     /** 请假人id */
     @Excel(name = "请假人id")
@@ -133,16 +133,16 @@ public class RecordLeave extends BaseEntity
     {
         return classId;
     }
-    public void setClasName(String clasName) 
-    {
-        this.clasName = clasName;
+
+    public String getClassName() {
+        return className;
     }
 
-    public String getClasName() 
-    {
-        return clasName;
+    public void setClassName(String className) {
+        this.className = className;
     }
-    public void setAbsenteeId(String absenteeId) 
+
+    public void setAbsenteeId(String absenteeId)
     {
         this.absenteeId = absenteeId;
     }
@@ -224,7 +224,7 @@ public class RecordLeave extends BaseEntity
             .append("endTime", getEndTime())
             .append("reason", getReason())
             .append("classId", getClassId())
-            .append("clasName", getClasName())
+            .append("className", getClassName())
             .append("absenteeId", getAbsenteeId())
             .append("absenteeName", getAbsenteeName())
             .append("examinersId", getExaminersId())

+ 6 - 6
ruoyi-system/src/main/resources/mapper/system/RecordLeaveMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime"    column="end_time"    />
         <result property="reason"    column="reason"    />
         <result property="classId"    column="class_id"    />
-        <result property="clasName"    column="clas_name"    />
+        <result property="className"    column="class_name"    />
         <result property="absenteeId"    column="absentee_id"    />
         <result property="absenteeName"    column="absentee_name"    />
         <result property="examinersId"    column="examiners_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRecordLeaveVo">
-        select id, type, start_time, end_time, reason, class_id, clas_name, absentee_id, absentee_name, examiners_id, examiners_name, category, is_pass, photo, submit_time, create_by, create_time, update_by, update_time, remark from record_leave
+        select id, type, start_time, end_time, reason, class_id, class_name, absentee_id, absentee_name, examiners_id, examiners_name, category, is_pass, photo, submit_time, create_by, create_time, update_by, update_time, remark from record_leave
     </sql>
 
     <select id="selectRecordLeaveList" parameterType="RecordLeave" resultMap="RecordLeaveResult">
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null "> and end_time = #{endTime}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
             <if test="classId != null "> and class_id = #{classId}</if>
-            <if test="clasName != null  and clasName != ''"> and clas_name like concat('%', #{clasName}, '%')</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
             <if test="absenteeId != null  and absenteeId != ''"> and absentee_id = #{absenteeId}</if>
             <if test="absenteeName != null  and absenteeName != ''"> and absentee_name like concat('%', #{absenteeName}, '%')</if>
             <if test="examinersId != null "> and examiners_id = #{examinersId}</if>
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null">end_time,</if>
             <if test="reason != null">reason,</if>
             <if test="classId != null">class_id,</if>
-            <if test="clasName != null">clas_name,</if>
+            <if test="className != null">class_name,</if>
             <if test="absenteeId != null">absentee_id,</if>
             <if test="absenteeName != null">absentee_name,</if>
             <if test="examinersId != null">examiners_id,</if>
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null">#{endTime},</if>
             <if test="reason != null">#{reason},</if>
             <if test="classId != null">#{classId},</if>
-            <if test="clasName != null">#{clasName},</if>
+            <if test="className != null">#{className},</if>
             <if test="absenteeId != null">#{absenteeId},</if>
             <if test="absenteeName != null">#{absenteeName},</if>
             <if test="examinersId != null">#{examinersId},</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null">end_time = #{endTime},</if>
             <if test="reason != null">reason = #{reason},</if>
             <if test="classId != null">class_id = #{classId},</if>
-            <if test="clasName != null">clas_name = #{clasName},</if>
+            <if test="className != null">class_name = #{className},</if>
             <if test="absenteeId != null">absentee_id = #{absenteeId},</if>
             <if test="absenteeName != null">absentee_name = #{absenteeName},</if>
             <if test="examinersId != null">examiners_id = #{examinersId},</if>