liujunchi 3 лет назад
Родитель
Сommit
a41a4cf6af

+ 11 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherMusicSheetVo.java

@@ -20,6 +20,9 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty("老师昵称")
     private String username;
 
+    @ApiModelProperty("老师真实姓名")
+    private String realName;
+
     @ApiModelProperty("手机号码")
     private String phone;
 
@@ -158,4 +161,12 @@ public class TeacherMusicSheetVo {
     public void setAuditName(String auditName) {
         this.auditName = auditName;
     }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
 }

+ 2 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -420,6 +420,7 @@
         select
         ms.create_by_ as teacherId
         ,su.username_ as username
+        ,su.real_name_ as realName
         ,su.phone_ as phone
         ,ms.id_ as musicSheetId
         ,ms.music_sheet_name_ as musicSheetName
@@ -462,7 +463,7 @@
                 and ms.charge_type_ = #{param.chargeType}
             </if>
         </where>
-        order by  ms.submit_audit_time_ desc
+        order by field(ms.audit_status_,'DOING') desc,  ms.submit_audit_time_ desc
     </select>
 
     <select id="selectTeacherMusicSheetCount" resultType="java.lang.Integer">