Merge remote-tracking branch 'origin/feature/1108_audio' into feature/1108_audio

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

@@ -50,6 +50,9 @@ public class Subject implements Serializable {
     @ApiModelProperty(value = "cbs声部名称")
     private String cbsSubjectName;
 
+	@ApiModelProperty(value = "总控乐器ID")
+	private Long instrumentId;
+
 	@TableField(value = "enable_flag_")
 	private Boolean enableFlag;
 

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

@@ -143,6 +143,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                     detail.setUserStatus(UserStatusEnum.NORMAL);
                 }
             }
+
+            // 设置学生声部乐器ID
+            if (StringUtils.isNotBlank(detail.getSubjectId())) {
+                List<Subject> subjects = subjectDao.findBySubjectByIdList(detail.getSubjectId());
+                // 设置声部乐器
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(subjects)) {
+                    detail.setInstrumentId(subjects.stream()
+                        .map(Subject::getInstrumentId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
+                }
+            }
         }
         return detail;
     }

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

@@ -103,6 +103,9 @@ public class StudentVo extends Student {
     @ApiModelProperty("客服数量")
     private Integer customerServiceNum;
 
+    @ApiModelProperty(value = "总控乐器ID")
+    private String instrumentId;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

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

@@ -17,6 +17,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
+        <result column="instrument_id_" property="instrumentId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->