update 订单导出增加新生课程专享

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SubjectChange.java

@@ -23,6 +23,9 @@ public class SubjectChange {
     @ApiModelProperty(value = "教务id")
     private Integer eduTeacherId;
 
+    @ApiModelProperty(value = "教务老师")
+    private String eduTeacher;
+
     @ApiModelProperty(value = "学生id")
     private Integer studentId;
 
@@ -40,6 +43,9 @@ public class SubjectChange {
     @ApiModelProperty(value = "乐团id")
     private String musicGroupId;
 
+    @ApiModelProperty(value = "乐团名称")
+    private String musicGroupName;
+
     /**
      * 原始课程费用
      */
@@ -533,4 +539,12 @@ public class SubjectChange {
     public void setMerNo(String merNo) {
         this.merNo = merNo;
     }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
 }

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -6,6 +6,7 @@
         <!--@Table subject_change-->
         <id column="id_" property="id"/>
         <result column="edu_teacher_id_" property="eduTeacherId"/>
+        <result column="eduTeacher" property="eduTeacher"/>
         <result column="student_id_" property="studentId"/>
         <result column="studentName" property="studentName"/>
         <result column="organ_id_" property="organId"/>
@@ -13,6 +14,7 @@
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
         <result column="cooperationOrganName" property="cooperationOrganName"/>
         <result column="music_group_id_" property="musicGroupId"/>
+        <result column="musicGroupName" property="musicGroupName"/>
         <result column="original_subject_id_" property="originalSubjectId"/>
         <result column="original_course_fee_" property="originalCourseFee"/>
         <result column="original_musical_" property="originalMusical"/>
@@ -215,9 +217,11 @@
     </select>
 
     <select id="getPageList" resultMap="SubjectChange">
-        SELECT sc.*,s.username_ studentName,o.name_ organName,co.name_ cooperationOrganName FROM
-        subject_change sc
+        SELECT sc.*,s.username_ studentName,o.name_ organName,co.name_ cooperationOrganName,edu.real_name_ eduTeacher,
+        mg.name_ musicGroupName FROM subject_change sc
+        LEFT JOIN music_group mg ON mg.id_ = sc.music_group_id_
         LEFT JOIN sys_user s ON sc.student_id_ = s.id_
+        LEFT JOIN sys_user edu ON edu.id_ = sc.edu_teacher_id_
         LEFT JOIN organization o ON sc.organ_id_ = o.id_
         LEFT JOIN cooperation_organ co ON sc.cooperation_organ_id_ = co.id_
         <include refid="queryPageSql"/>
@@ -227,7 +231,7 @@
     <sql id="queryPageSql">
         <where>
             <if test="search != null and search != ''">
-                AND (sc.order_no_ = #{search} OR sc.trans_no_ = #{search})
+                AND (sc.order_no_ = #{search} OR sc.trans_no_ = #{search} OR s.username_ LIKE CONCAT('%',#{search},'%'))
             </if>
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(sc.organ_id_,#{organIdList})