修改班会材料搜索

srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java

@@ -3,13 +3,19 @@ package com.srs.routine.domain;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.srs.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.*;
+import com.srs.common.core.domain.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import com.srs.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 
 
@@ -119,17 +125,17 @@ private static final long serialVersionUID=1L;
     private String crAddr;
 
     /**
-     * 状态：0：保存、1：发布，2：停用，3：结束
+     * 状态:0:保存、1:发布,2:停用,3:结束
      */
-    @ApiModelProperty("状态：0：保存、1：发布，2：停用，3：结束")
+    @ApiModelProperty("状态:0:保存、1:发布,2:停用,3:结束")
     @TableField("status")
-    @Excel(name = "状态：0：保存、1：发布，2：停用，3：结束")
+    @Excel(name = "状态:0:保存、1:发布,2:停用,3:结束")
     private String status;
 
     /**
-     * 删除标志（0代表存在
+     * 删除标志(0代表存在
      */
-    @ApiModelProperty("删除标志（0代表存在")
+    @ApiModelProperty("删除标志(0代表存在")
     @TableField("del_flag")
     private String delFlag;
 
@@ -158,4 +164,16 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private List<SrsAttachResource> attachResourceList;
 
+    /**
+     * 学院ID(用于查询条件)
+     */
+    @TableField(exist = false)
+    private Long deptId;
+
+    /**
+     * 学院名称(用于显示)
+     */
+    @TableField(exist = false)
+    private String deptName;
+
 }

srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml

@@ -55,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN
             srs_class sc ON rm.cr_class_no = sc.class_id
                 LEFT JOIN
+            srs_majors sm ON sc.major_id = sm.major_id
+                LEFT JOIN
             sys_user u ON rm.cr_teacher_no = u.user_name
     </sql>
 
@@ -65,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="crCmNo != null  and crCmNo != ''"> and rm.cr_cm_no = #{crCmNo}</if>
             <if test="crCmTitle != null  and crCmTitle != ''"> and mt.cm_title like concat('%',#{crCmTitle},'%')</if>
             <if test="crDepartmentNo != null  and crDepartmentNo != ''"> and rm.cr_department_no = #{crDepartmentNo}</if>
+            <if test="deptId != null"> and sm.college_id = #{deptId}</if>
             <if test="crMajorNo != null  and crMajorNo != ''"> and rm.cr_major_no = #{crMajorNo}</if>
             <if test="crClassNo != null  and crClassNo != ''"> and rm.cr_class_no = #{crClassNo}</if>
             <if test="crTeacherNo != null  and crTeacherNo != ''"> and rm.cr_teacher_no = #{crTeacherNo}</if>