提交代码

backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java

@@ -110,6 +110,11 @@ public class XskhDisciplineRecord extends TenantEntity {
      */
     private String status;
 
+    /**
+     * 违纪来源(1-宿舍卫生检查 2-教学区违纪)
+     */
+    private String violationSource;
+
     /**
      * 附件OSS ID列表，逗号分隔
      */

backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineRecordBo.java

@@ -128,6 +128,11 @@ public class XskhDisciplineRecordBo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 违纪来源(1-宿舍卫生检查 2-教学区违纪)
+     */
+    private String violationSource;
+
     /**
      * 附件OSS ID列表，逗号分隔
      */

backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhDisciplineRecordVo.java

@@ -131,11 +131,20 @@ public class XskhDisciplineRecordVo implements Serializable {
      * 状态(1-生效 2-已撤销)
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "student_discipline_status")
+    @ExcelDictFormat(dictType = "xskh_discipline_status")
     private String status;
+
+    /**
+     * 违纪来源(1-宿舍卫生检查 2-教学区违纪)
+     */
+    @ExcelProperty(value = "违纪来源", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "xskh_violation_source")
+    private String violationSource;
+
     /**
      * 附件OSS ID列表，逗号分隔
      */
+    @ExcelProperty(value = "附件OSS ID列表")
     private String attachmentOssIds;
 
     /**

backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="disciplineContent" column="discipline_content" />
         <result property="scoreDeduction" column="score_deduction" />
         <result property="status" column="status" />
+        <result property="violationSource" column="violation_source" />
         <result property="attachmentOssIds" column="attachment_oss_ids" />
         <result property="createBy" column="create_by" />
         <result property="createTime" column="create_time" />
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectXskhDisciplineRecordVo">
-        select id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name, discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content, score_deduction, status, attachment_oss_ids, create_by, create_time, create_dept, update_by, update_time, deleted, tenant_id from xskh_discipline_record
+        select id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name, discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content, score_deduction, status, violation_source, attachment_oss_ids, create_by, create_time, create_dept, update_by, update_time, deleted, tenant_id from xskh_discipline_record
     </sql>
 
     <select id="selectStudentOptions" parameterType="String" resultMap="StudentOptionResult">