fix:老师 学历 教资认证

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -151,6 +151,15 @@ public class Teacher implements Serializable {
     private Date styleDate;
 
 
+    @ApiModelProperty("学位认证 0:未认证 1：已认证 ")
+    @TableField(value = "degree_flag_")
+    private YesOrNoEnum degreeFlag;
+
+
+    @ApiModelProperty("教师资格认证 0：未认证 1：已认证 ")
+    @TableField(value = "teacher_flag_")
+    private YesOrNoEnum teacherFlag;
+
     @ApiModelProperty("学位认证时间 ")
     @TableField(value = "degree_date_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -205,6 +214,23 @@ public class Teacher implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+
+    public YesOrNoEnum getDegreeFlag() {
+        return degreeFlag;
+    }
+
+    public void setDegreeFlag(YesOrNoEnum degreeFlag) {
+        this.degreeFlag = degreeFlag;
+    }
+
+    public YesOrNoEnum getTeacherFlag() {
+        return teacherFlag;
+    }
+
+    public void setTeacherFlag(YesOrNoEnum teacherFlag) {
+        this.teacherFlag = teacherFlag;
+    }
+
     public Date getDegreeDate() {
         return degreeDate;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherTagEnum.java

@@ -15,8 +15,6 @@ public enum TeacherTagEnum implements BaseEnum<String, TeacherTagEnum> {
     STYLE("个人风采"),
     VIDEO("视频课"),
     MUSIC("曲目"),
-    DEGREE("学历"),
-    TEACHER("教资"),
     LIVE("直播课");
     @EnumValue
     private String code;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -154,7 +154,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         Teacher teacher = teacherService.getById(teacherUser.getId());
 
         if (teacher != null) {
-            result.setTeacherTag(teacher.getTag());
+            result.setDegreeFlag(teacher.getDegreeFlag());
+            result.setTeacherFlag(teacher.getTeacherFlag());
+
         }
         result.setTeacherName(teacherUser.getRealName());
         result.setUserName(teacherUser.getUsername());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -79,8 +79,6 @@ public class HomeServiceImpl implements HomeService {
         Integer videoTagNum = 0;
         Integer liveTagNum = 0;
         Integer musicTagNum = 0;
-        Integer degreeTagNum = 0;
-        Integer teacherTagNum = 0;
         for (HomeTotalTeacher totalTeacher : totalList) {
             totalTeacher.setRegisterNum(null == totalTeacher.getRegisterNum() ? 0 : totalTeacher.getRegisterNum());
             totalTeacher.setEntryNum(null == totalTeacher.getEntryNum() ? 0 : totalTeacher.getEntryNum());
@@ -93,21 +91,15 @@ public class HomeServiceImpl implements HomeService {
                 List<TagTotalTeacher> musicTagList = typeGroup.get(TeacherTagEnum.MUSIC.getCode());
                 List<TagTotalTeacher> styleTagList = typeGroup.get(TeacherTagEnum.STYLE.getCode());
                 List<TagTotalTeacher> videoTagList = typeGroup.get(TeacherTagEnum.VIDEO.getCode());
-                List<TagTotalTeacher> degreeTagList = typeGroup.get(TeacherTagEnum.DEGREE.getCode());
-                List<TagTotalTeacher> teacherTagList = typeGroup.get(TeacherTagEnum.TEACHER.getCode());
                 totalTeacher.setLiveTagNum(CollectionUtils.isEmpty(liveTagList) ? 0:liveTagList.size());
                 totalTeacher.setMusicTagNum(CollectionUtils.isEmpty(musicTagList) ? 0:musicTagList.size());
                 totalTeacher.setStyleTagNum(CollectionUtils.isEmpty(styleTagList) ? 0:styleTagList.size());
                 totalTeacher.setVideoTagNum(CollectionUtils.isEmpty(videoTagList) ? 0:videoTagList.size());
-                totalTeacher.setDegreeTagNum(CollectionUtils.isEmpty(degreeTagList) ? 0:degreeTagList.size());
-                totalTeacher.setTeacherTagNum(CollectionUtils.isEmpty(teacherTagList) ? 0:teacherTagList.size());
             } else {
                 totalTeacher.setLiveTagNum(0);
                 totalTeacher.setMusicTagNum(0);
                 totalTeacher.setStyleTagNum(0);
                 totalTeacher.setVideoTagNum(0);
-                totalTeacher.setDegreeTagNum(0);
-                totalTeacher.setTeacherTagNum(0);
             }
 
 
@@ -129,8 +121,6 @@ public class HomeServiceImpl implements HomeService {
             videoTagNum += totalTeacher.getVideoTagNum();
             liveTagNum += totalTeacher.getLiveTagNum();
             musicTagNum += totalTeacher.getMusicTagNum();
-            degreeTagNum += totalTeacher.getDegreeTagNum();
-            teacherTagNum += totalTeacher.getTeacherTagNum();
         }
         HomeTotalTeacher total = new HomeTotalTeacher();
         total.setRegisterNum(registerNum);
@@ -142,8 +132,6 @@ public class HomeServiceImpl implements HomeService {
         total.setVideoTagNum(videoTagNum);
         total.setLiveTagNum(liveTagNum);
         total.setMusicTagNum(musicTagNum);
-        total.setDegreeTagNum(degreeTagNum);
-        total.setTeacherTagNum(teacherTagNum);
         total.setInfoList(totalList);
         return HttpResponseResult.succeed(total);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -1005,10 +1006,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (CollectionUtils.isEmpty(musicSheetList)) {
             return true;
         }
-        this.lambdaUpdate()
-            .in(MusicSheet::getId,musicSheetList.stream().map(MusicSheet::getId).collect(Collectors.toList()))
-            .set(MusicSheet::getState,reasonDto.getState())
-            .update();
+        LambdaUpdateChainWrapper<MusicSheet> wrapper = this.lambdaUpdate()
+                                                       .in(MusicSheet::getId, musicSheetList.stream()
+                                                                .map(MusicSheet::getId)
+                                                                .collect(Collectors.toList()))
+                                                       .set(MusicSheet::getState, reasonDto.getState());
+        if (reasonDto.getState().equals(YesOrNoEnum.NO)) {
+            wrapper.set(MusicSheet::getTopFlag,0);
+        }
+        wrapper.update();
 
         // 发送推送
         if (reasonDto.getState().equals(YesOrNoEnum.YES)){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -110,10 +110,10 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 String styleVideoJson = build.getStyleVideoJson();
                 saveStyleVideo(styleVideoJson, build.getUserId(), sysUser.getId());
 
+                setTag(authOperaReq, build, teacher);
                 //记录达人认证时间
                 userFirstTimeService.recordTime(build.getUserId(), ClientEnum.TEACHER, UserFirstTimeTypeEnum.ENTRY);
 
-                setTag(authOperaReq, build, teacher);
             }
             if (null == teacher.getEntryFlag() || YesOrNoEnum.NO.equals(teacher.getEntryFlag())) {
                 teacher.setEntryFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
@@ -135,20 +135,20 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     private void setTag(AuthOperaReq authOperaReq, TeacherAuthEntryRecord build, TeacherVo teacher) {
         if (authOperaReq.getPass()) {
             if (!StringUtil.isEmpty(teacher.getTeacherCertificate())) {
-                teacherService.setTeacherTag(build.getUserId(), TeacherTagEnum.TEACHER);
-            } else if (!StringUtil.isEmpty(teacher.getTag())) {
-                teacher.setTag(Arrays.stream(teacher.getTag().split(","))
-                        .filter(s -> !s.equals("TEACHER"))
-                        .collect(Collectors.joining(",")));
+                teacher.setTeacherDate(new Date());
+                teacher.setTeacherFlag(YesOrNoEnum.YES);
+            } else {
+                teacher.setTeacherFlag(YesOrNoEnum.NO);
+                teacher.setTeacherDate(null);
             }
         }
         if (authOperaReq.getPass()) {
             if (!StringUtil.isEmpty(teacher.getDegreeCertificate()) && !StringUtil.isEmpty(teacher.getGradCertificate())) {
-                teacherService.setTeacherTag(build.getUserId(), TeacherTagEnum.DEGREE);
-            } else if (!StringUtil.isEmpty(teacher.getTag())) {
-                teacher.setTag(Arrays.stream(teacher.getTag().split(","))
-                        .filter(s -> !s.equals("DEGREE"))
-                        .collect(Collectors.joining(",")));
+                teacher.setDegreeFlag(YesOrNoEnum.YES);
+                teacher.setDegreeDate(new Date());
+            } else  {
+                teacher.setDegreeFlag(YesOrNoEnum.NO);
+                teacher.setDegreeDate(null);
             }
         }
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -520,10 +520,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             teacherVo.setLiveDate(new Date());
         } else if (teacherTagEnum.equals(TeacherTagEnum.VIDEO)) {
             teacherVo.setLiveDate(new Date());
-        } else if (teacherTagEnum.equals(TeacherTagEnum.TEACHER)) {
-            teacherVo.setTeacherDate(new Date());
-        } else if (teacherTagEnum.equals(TeacherTagEnum.DEGREE)) {
-            teacherVo.setDegreeDate(new Date());
         }
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -177,7 +177,8 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
 
         Teacher teacher = teacherService.getById(videoLessonGroupVo.getTeacherId());
         if (teacher != null) {
-            lessonStudentVo.setTeacherTag(teacher.getTag());
+            lessonStudentVo.setTeacherFlag(teacher.getTeacherFlag());
+            lessonStudentVo.setDegreeFlag(teacher.getDegreeFlag());
         }
 
         lessonStudentVo.setLessonGroup(videoLessonGroupVo);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseInfoVo.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -29,17 +30,28 @@ public class LiveCourseInfoVo extends CourseGroupVo implements Serializable {
     @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
     private YesOrNoEnum auditVersion = YesOrNoEnum.NO;
 
-    @ApiModelProperty("老师标签")
-    private String teacherTag;
+    @ApiModelProperty("学位认证 0:未认证 1：已认证 ")
+    private YesOrNoEnum degreeFlag;
 
-    public String getTeacherTag() {
-        return teacherTag;
+
+    @ApiModelProperty("教师资格认证 0：未认证 1：已认证 ")
+    private YesOrNoEnum teacherFlag;
+
+    public YesOrNoEnum getDegreeFlag() {
+        return degreeFlag;
     }
 
-    public void setTeacherTag(String teacherTag) {
-        this.teacherTag = teacherTag;
+    public void setDegreeFlag(YesOrNoEnum degreeFlag) {
+        this.degreeFlag = degreeFlag;
     }
 
+    public YesOrNoEnum getTeacherFlag() {
+        return teacherFlag;
+    }
+
+    public void setTeacherFlag(YesOrNoEnum teacherFlag) {
+        this.teacherFlag = teacherFlag;
+    }
 
     public YesOrNoEnum getAuditVersion() {
         return auditVersion;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonStudentVo.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -23,15 +25,27 @@ public class VideoLessonStudentVo extends BaseEntity {
     @ApiModelProperty(value = "true 自己的课,false 其他老师的课程")
     private Boolean myself;
 
-    @ApiModelProperty("老师标签")
-    private String teacherTag;
+    @ApiModelProperty("学位认证 0:未认证 1：已认证 ")
+    private YesOrNoEnum degreeFlag;
 
-    public String getTeacherTag() {
-        return teacherTag;
+
+    @ApiModelProperty("教师资格认证 0：未认证 1：已认证 ")
+    private YesOrNoEnum teacherFlag;
+
+    public YesOrNoEnum getDegreeFlag() {
+        return degreeFlag;
+    }
+
+    public void setDegreeFlag(YesOrNoEnum degreeFlag) {
+        this.degreeFlag = degreeFlag;
+    }
+
+    public YesOrNoEnum getTeacherFlag() {
+        return teacherFlag;
     }
 
-    public void setTeacherTag(String teacherTag) {
-        this.teacherTag = teacherTag;
+    public void setTeacherFlag(YesOrNoEnum teacherFlag) {
+        this.teacherFlag = teacherFlag;
     }
 
     public Boolean getMyself() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/HomeTotalTeacher.java

@@ -39,31 +39,6 @@ public class HomeTotalTeacher {
     @ApiModelProperty("曲目人数")
     private Integer musicTagNum;
 
-
-    @ApiModelProperty("学历人数")
-    private Integer degreeTagNum;
-
-
-
-    @ApiModelProperty("教资人数")
-    private Integer teacherTagNum;
-
-    public Integer getDegreeTagNum() {
-        return degreeTagNum;
-    }
-
-    public void setDegreeTagNum(Integer degreeTagNum) {
-        this.degreeTagNum = degreeTagNum;
-    }
-
-    public Integer getTeacherTagNum() {
-        return teacherTagNum;
-    }
-
-    public void setTeacherTagNum(Integer teacherTagNum) {
-        this.teacherTagNum = teacherTagNum;
-    }
-
     public Integer getStyleTagNum() {
         return styleTagNum;
     }

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

@@ -351,48 +351,6 @@
 				<![CDATA[AND video_date_ < #{param.endTime} ]]>
 			</if>
 		</where>
-		UNION all
-
-		SELECT
-		<if test="timeType != null and timeType == 'MONTH'">
-			DATE_FORMAT(degree_date_,'%Y-%m-%d') as timeStr,
-		</if>
-		<if test="timeType != null and timeType == 'YEAR'">
-			DATE_FORMAT(degree_date_,'%Y-%m') as timeStr,
-		</if>
-		user_id_ ,
-		'DEGREE' as tagType
-		FROM
-		teacher
-		<where>
-			<if test="param.startTime !=null">
-				<![CDATA[AND degree_date_ >= #{param.startTime} ]]>
-			</if>
-			<if test="param.endTime !=null">
-				<![CDATA[AND degree_date_ < #{param.endTime} ]]>
-			</if>
-		</where>
-		UNION all
-
-		SELECT
-		<if test="timeType != null and timeType == 'MONTH'">
-			DATE_FORMAT(teacher_date_,'%Y-%m-%d') as timeStr,
-		</if>
-		<if test="timeType != null and timeType == 'YEAR'">
-			DATE_FORMAT(teacher_date_,'%Y-%m') as timeStr,
-		</if>
-		user_id_ ,
-		'TEACHER' as tagType
-		FROM
-		teacher
-		<where>
-			<if test="param.startTime !=null">
-				<![CDATA[AND teacher_date_ >= #{param.startTime} ]]>
-			</if>
-			<if test="param.endTime !=null">
-				<![CDATA[AND teacher_date_ < #{param.endTime} ]]>
-			</if>
-		</where>
 	</select>
 
 	<select id="selectSubjectHome" resultType="com.yonge.cooleshow.biz.dal.vo.SubjectHomeVo">

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -25,6 +25,10 @@
         <result column="music_date_" property="musicDate" />
         <result column="video_date_" property="videoDate" />
         <result column="style_date_" property="styleDate" />
+        <result column="degree_date_" property="degreeDate" />
+        <result column="teacher_date_" property="teacherDate" />
+        <result column="degree_flag_" property="degreeFlag" />
+        <result column="teacher_flag_" property="teacherFlag" />
         <result column="browse_" property="browse" />
         <result column="memo_" property="memo" />
         <result column="lock_flag_" property="lockFlag" />
@@ -53,6 +57,10 @@
         , t.music_date_ as "musicDate"
         , t.video_date_ as "videoDate"
         , t.style_date_ as "styleDate"
+        , t.degree_date_ as "degreeDate"
+        , t.teacher_date_ as "teacherDate"
+        , t.degree_flag_ as "degreeFlag"
+        , t.teacher_flag_ as "teacherFlag"
         , t.member_rank_setting_id_ as "memberRankSettingId"
         , t.membership_start_time_ as "membershipStartTime"
         , t.membership_end_time_ as "membershipEndTime"