Browse Source

审核统计修改

liweifan 3 years ago
parent
commit
5134960d6e

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessage.java

@@ -19,7 +19,7 @@ public class SysMessage extends BaseEntity {
 	@ApiModelProperty("消息配置表id")
 	private Long messageConfigId;
 
-	@ApiModelProperty("TEACHER_AUTH:老师认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱," +
+	@ApiModelProperty("TEACHER_AUTH:达人认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱," +
 			"COURSE:课程,INCOME:收入,HOMEWORK:作业,EVALUATE:评价,GROUP_CHAT:群聊,VIP:会员,NOTICE:公告")
 	private String subType;
 	

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -78,7 +78,7 @@ public class TeacherAuthEntryRecord implements Serializable {
 	@TableField(value = "teacher_certificate_")
     private String teacherCertificate;
 
-    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
+    @ApiModelProperty("达人认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthMusicianRecord.java

@@ -33,7 +33,7 @@ public class TeacherAuthMusicianRecord implements Serializable {
 	@TableField(value = "user_id_")
     private Long userId;
 
-    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
+    @ApiModelProperty("达人认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageIconTypeEnum.java

@@ -10,7 +10,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @date 2022-05-09
  */
 public enum MessageIconTypeEnum implements BaseEnum<String, MessageIconTypeEnum> {
-    TEACHER_AUTH("老师认证"),
+    TEACHER_AUTH("达人认证"),
     MUSICIAN_AUTH("音乐人认证"),
     PRACTICE("陪练课"),
     LIVE("直播课"),

+ 4 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -26,11 +26,11 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_REVIEW_HOMEWORK("老师点评作业"),
     STUDENT_SUBMIT_HOMEWORK("学员提交作业"),
 
-    TEACHER_AUTH_PASS("老师认证通过"),
-    SMS_TEACHER_AUTH_PASS("老师认证通过(短信)"),
+    TEACHER_AUTH_PASS("达人认证通过"),
+    SMS_TEACHER_AUTH_PASS("达人认证通过(短信)"),
 
-    TEACHER_AUTH_FAIL("老师认证失败"),
-    SMS_TEACHER_AUTH_FAIL("老师认证失败(短信)"),
+    TEACHER_AUTH_FAIL("达人认证失败"),
+    SMS_TEACHER_AUTH_FAIL("达人认证失败(短信)"),
 
     MUSICIAN_AUTH_PASS("音乐人认证通过"),
     SMS_MUSICIAN_AUTH_PASS("音乐人认证通过(短信)"),

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/HomeUserToDoNum.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "HomeUserToDoNum", description = "后台首页待办事项统计查询对象")
 public class HomeUserToDoNum {
-    @ApiModelProperty("待审核老师认证数 ")
+    @ApiModelProperty("待审核达人认证数 ")
     private Integer entryNum;
     @ApiModelProperty("待审核音乐认证人数 ")
     private Integer musicianNum;

+ 12 - 4
cooleshow-user/user-biz/src/main/resources/config/mybatis/HomeMapper.xml

@@ -4,11 +4,19 @@
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.HomeDao">
 	<select id="getUserToDoNum" resultType="com.yonge.cooleshow.biz.dal.vo.res.HomeUserToDoNum">
 		select
-			(select count(1) from teacher_auth_entry_record where teacher_auth_status_ = 'DOING') as entryNum,
-			(select count(1) from teacher_auth_musician_record where teacher_auth_status_ = 'DOING') as musicianNum,
-        	(select count(1) from music_sheet where del_flag_ = 0 and audit_status_ = 'DOING') as musicNum,
+			(select count(1) from teacher_auth_entry_record a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.teacher_auth_status_ = 'DOING') as entryNum,
+			(select count(1) from teacher_auth_musician_record a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.teacher_auth_status_ = 'DOING') as musicianNum,
+        	(select count(1) from music_sheet a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.del_flag_ = 0 and a.audit_status_ = 'DOING') as musicNum,
         	(select count(1) from video_lesson_auth_record where audit_status_ = 'DOING') as videoCourseNum,
-			(select count(1) from teacher_style_video where del_flag_ = 0 and auth_status_ = 'DOING') as styleNum
+			(select count(1) from teacher_style_video a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.del_flag_ = 0 and a.auth_status_ = 'DOING') as styleNum
         from dual
 	</select>