update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherSubmitReq.java

@@ -3,9 +3,10 @@ package com.yonge.cooleshow.biz.dal.dto.req;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author: liweifan
  * @Data: 2022/3/18 14:56
@@ -37,6 +38,12 @@ public class TeacherSubmitReq implements Serializable {
     @NotBlank(message = "专业技能不能为空")
     @ApiModelProperty(value = "专业技能（支持多个，用逗号分隔），对应乐器表id ", required = true)
     private String subjectId;
+	
+    @ApiModelProperty("是否结算")
+	private Boolean isSettlement;
+	
+    @ApiModelProperty("是否测试用户")
+	private Boolean isTestUser;
 
 
     public Long getUserId() {
@@ -95,4 +102,20 @@ public class TeacherSubmitReq implements Serializable {
     public void setTeacherType(String teacherType) {
         this.teacherType = teacherType;
     }
+
+	public Boolean getIsSettlement() {
+		return isSettlement;
+	}
+
+	public void setIsSettlement(Boolean isSettlement) {
+		this.isSettlement = isSettlement;
+	}
+
+	public Boolean getIsTestUser() {
+		return isTestUser;
+	}
+
+	public void setIsTestUser(Boolean isTestUser) {
+		this.isTestUser = isTestUser;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -64,6 +64,9 @@ public class MusicSheetSearch  extends QueryInfo{
 
     @ApiModelProperty(value = "是否置顶(0:否;1:是)")
     private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
+    
+    @ApiModelProperty(value = "精品标志(0:否;1:是)")
+    private YesOrNoEnum exquisiteFlag;
 
     @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
     private YesOrNoEnum auditVersion;
@@ -95,7 +98,15 @@ public class MusicSheetSearch  extends QueryInfo{
         this.topFlag = topFlag;
     }
 
-    public Boolean getMyself() {
+    public YesOrNoEnum getExquisiteFlag() {
+		return exquisiteFlag;
+	}
+
+	public void setExquisiteFlag(YesOrNoEnum exquisiteFlag) {
+		this.exquisiteFlag = exquisiteFlag;
+	}
+
+	public Boolean getMyself() {
         return myself;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherSearch.java

@@ -34,6 +34,12 @@ public class TeacherSearch extends QueryInfo{
     
     @ApiModelProperty("声部编号")
     private Long subjectId;
+	
+    @ApiModelProperty("是否结算")
+	private Boolean isSettlement;
+	
+    @ApiModelProperty("是否测试用户")
+	private Boolean isTestUser;
 
     public String getSearch() {
         return search;
@@ -98,4 +104,20 @@ public class TeacherSearch extends QueryInfo{
 	public void setSubjectId(Long subjectId) {
 		this.subjectId = subjectId;
 	}
+
+	public Boolean getIsSettlement() {
+		return isSettlement;
+	}
+
+	public void setIsSettlement(Boolean isSettlement) {
+		this.isSettlement = isSettlement;
+	}
+
+	public Boolean getIsTestUser() {
+		return isTestUser;
+	}
+
+	public void setIsTestUser(Boolean isTestUser) {
+		this.isTestUser = isTestUser;
+	}
 }

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

@@ -1,20 +1,26 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.yonge.cooleshow.biz.dal.enums.*;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.AccompanimentTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+
 /**
  * 曲谱表
  * @author yzp
@@ -132,6 +138,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "是否热门曲谱(0:否;1:是)")
     private YesOrNoEnum hotFlag;  //是否热门曲谱(0:否;1:是)
 
+    @TableField("exquisite_flag_")
+    @ApiModelProperty(value = "精品标志(0:否;1:是)")
+    private YesOrNoEnum exquisiteFlag;
+
     @TableField("music_price_")
     @ApiModelProperty(value = "曲谱价格")
     private java.math.BigDecimal musicPrice;  //曲谱价格
@@ -390,6 +400,14 @@ public class MusicSheet implements Serializable {
 		this.topFlag = topFlag;
 	}
 
+	public YesOrNoEnum getExquisiteFlag() {
+		return exquisiteFlag;
+	}
+
+	public void setExquisiteFlag(YesOrNoEnum exquisiteFlag) {
+		this.exquisiteFlag = exquisiteFlag;
+	}
+
 	public YesOrNoEnum getHotFlag() {
 		return hotFlag;
 	}

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

@@ -386,6 +386,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacher.setEntryAuthDate(null);
         teacher.setMusicianFlag(YesOrNoEnum.NO);
         teacher.setMusicianDate(null);
+        teacher.setIsSettlement(teacherSubmitReq.getIsSettlement());
+        teacher.setIsTestUser(teacherSubmitReq.getIsTestUser());
         if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
             return teacher;
         }

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

@@ -18,6 +18,7 @@
         <result column="sort_number_" jdbcType="INTEGER" property="sortNumber"/>
         <result column="top_flag_" jdbcType="TINYINT" property="topFlag"/>
         <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag"/>
+        <result column="exquisite_flag_" jdbcType="TINYINT" property="exquisiteFlag"/>
         <result column="music_price_" jdbcType="DECIMAL" property="musicPrice"/>
         <result column="audio_file_url_" jdbcType="VARCHAR" property="audioFileUrl"/>
         <result column="xml_file_url_" jdbcType="VARCHAR" property="xmlFileUrl"/>
@@ -49,6 +50,7 @@
         t.audit_status_ as auditStatus,
         t.sort_number_ as sortNumber,
         t.top_flag_ as topFlag,
+        t.exquisite_flag_ as exquisiteFlag,
         t.hot_flag_ as hotFlag,
         t.music_price_ as musicPrice,
         t.audio_file_url_ as audioFileUrl,
@@ -136,6 +138,9 @@
         <if test="param.topFlag != null">
             and t.top_flag_ = #{param.topFlag}
         </if>
+        <if test="param.exquisiteFlag != null">
+            and t.exquisite_flag_ = #{param.exquisiteFlag}
+        </if>
         <if test="param.accompanimentType != null">
             and t.accompaniment_type_ = #{param.accompanimentType}
         </if>

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

@@ -144,6 +144,12 @@
             <if test="param.subjectId != null">
             	and find_in_set(#{param.subjectId},t.subject_id_)
             </if>
+            <if test="param.isSettlement != null">
+            	and t.is_settlement_ = #{param.isSettlement}
+            </if>
+            <if test="param.isTestUser != null">
+            	and t.is_test_user_ = #{param.isTestUser}
+            </if>
         </where>
         order by t.create_time_ desc
     </select>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -8,6 +8,7 @@ import java.util.Date;
 
 import javax.validation.Valid;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -24,11 +25,13 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -55,6 +58,9 @@ public class MusicSheetController extends BaseController {
 	@Autowired
 	private MusicSheetService musicSheetService;
 
+    @Autowired
+    private TeacherService teacherService;
+
     /**
      * 曲目收藏
      */
@@ -114,6 +120,14 @@ public class MusicSheetController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
+
+        Teacher teacher = teacherService.getById(sysUser.getId());
+        if (teacher == null) {
+            return failed("用户信息获取失败");
+        }
+        if(StringUtils.isBlank(query.getSubjectIds())){
+        	query.setSubjectIds(teacher.getSubjectId());
+        }
         // 设置只查老师用户 状态为启用
         query.setCreateBy(sysUser.getId());
         if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {