update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -53,7 +53,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param userIds
      * @return
      */
-    List<Map<Integer, String>> queryNameByIds(@Param("userIds") Set<Integer> userIds);
+    List<Map<Integer, String>> queryNameByIds(@Param("userIds") String userIds);
+
+    /**
+     * 根据用户编号获取用户名称
+     *
+     * @param userId
+     * @return
+     */
+    String queryNameById(@Param("userId") Integer userId);
 
     /**
      * 查询分部所有老师

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -3,9 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -21,8 +19,12 @@ public class MusicGroup {
 	private String name;
 	
 	/** 所属分部 */
-	@ApiModelProperty(value = "所属分部",required = false)
+	@ApiModelProperty(value = "所属分部编号",required = false)
 	private Integer organId;
+
+	/** 所属分部 */
+	@ApiModelProperty(value = "所属分部名称",required = false)
+	private String organName;
 	
 	/** 学校(合作单位) */
 	@ApiModelProperty(value = "学校(合作单位) ",required = false)
@@ -31,6 +33,10 @@ public class MusicGroup {
 	/** 学校(合作单位) */
 	@ApiModelProperty(value = "学校名称 ",required = false)
 	private String schoolName;
+
+	/** 学校(合作单位) */
+	@ApiModelProperty(value = "上课地点 ",required = false)
+	private String address;
 	
 	/** 报名截止日期 */
 	@ApiModelProperty(value = "报名截止日期",required = false)
@@ -47,7 +53,7 @@ public class MusicGroup {
 	@ApiModelProperty(value = "教务老师名字",required = false)
 	private String educationalTeacherName;
 	/** 教务老师 */
-	@ApiModelProperty(value = "教务老师",required = false)
+	@ApiModelProperty(value = "教务老师编号",required = false)
 	private Integer educationalTeacherId;
 	
 	/** 收费类型 */
@@ -116,6 +122,22 @@ public class MusicGroup {
 	@ApiModelProperty(value = "在读人数",required = true)
 	private Integer payNum;
 
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public String getSchoolName() {
 		return schoolName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentRegistrationQueryInfo.java

@@ -8,7 +8,7 @@ import com.ym.mec.common.page.QueryInfo;
 public class StudentRegistrationQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "乐团编号",required = false)
-    private Integer musicGroupId;
+    private String musicGroupId;
 
     @ApiModelProperty(value = "是否允许调剂",required = false)
     private String isAllowAdjust;
@@ -41,11 +41,11 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
         this.actualSubjectId = actualSubjectId;
     }
 
-    public Integer getMusicGroupId() {
+    public String getMusicGroupId() {
         return musicGroupId;
     }
 
-    public void setMusicGroupId(Integer musicGroupId) {
+    public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -165,4 +165,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	MusicGroup openPay(String musicGroupId);
+
+	/**
+	 * 获取乐团详情
+	 * @param musicGroupId
+	 * @return
+	 */
+	MusicGroup getMusicGroupDetail(String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -85,6 +85,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private CourseScheduleDao courseScheduleDao;
 
     @Autowired
+    private OrganizationDao organizationDao;
+
+    @Autowired
     private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
 
     @Autowired
@@ -539,12 +542,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         // 获取教务老师编号列表
         Set<Integer> educationalTeacherIds = musicGroupList.stream().map(e -> e.getEducationalTeacherId()).collect(Collectors.toSet());
         // 获取相关老师的名字
-        List<Map<Integer, String>> educationalTeacherNames = teacherDao.queryNameByIds(educationalTeacherIds);
+        List<Map<Integer, String>> educationalTeacherNames = teacherDao.queryNameByIds(StringUtils.join(educationalTeacherIds,","));
         Map<Integer, String> educationalTeacherNameMap = MapUtil.convertMybatisMap(educationalTeacherNames);
 
         // 获取运营主管编号列表
         Set<Integer> teamTeacherIds = musicGroupList.stream().map(e -> e.getTeamTeacherId()).collect(Collectors.toSet());
-        List<Map<Integer, String>> teamTeacherNames = teacherDao.queryNameByIds(teamTeacherIds);
+        List<Map<Integer, String>> teamTeacherNames = teacherDao.queryNameByIds(StringUtils.join(teamTeacherIds,","));
         Map<Integer, String> teamTeacherNameMap = MapUtil.convertMybatisMap(teamTeacherNames);
 
         // 获取乐团编号列表
@@ -618,7 +621,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             // 删除乐团付费主体列表
             musicGroupPaymentEntitiesDao.delByGroupId(musicGroupId);
             //批量新增
-            if(subFeeSettingDto.getMusicGroupPaymentEntities() != null){
+            if(subFeeSettingDto.getMusicGroupPaymentEntities() != null && subFeeSettingDto.getMusicGroupPaymentEntities().size() > 0){
                 musicGroupPaymentEntitiesDao.batchAdd(subFeeSettingDto.getMusicGroupPaymentEntities(),musicGroupId);
             }
         }
@@ -652,7 +655,27 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         musicGroup.setStatus(MusicGroupStatusEnum.PAY);
         musicGroupDao.update(musicGroup);
+        return musicGroup;
+    }
 
+    @Override
+    public MusicGroup getMusicGroupDetail(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
+        musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
+        Organization organization = organizationDao.get(musicGroup.getOrganId());
+        if(organization != null){
+            musicGroup.setOrganName(organization.getName());
+        }
+        School school = schoolDao.get(musicGroup.getSchoolId());
+        if(school != null){
+            musicGroup.setSchoolName(school.getName());
+            musicGroup.setAddress(school.getAddress());
+        }
+        ChargeType chargeType = chargeTypeDao.get(musicGroup.getChargeTypeId());
+        if(chargeType != null){
+            musicGroup.setChargeTypeName(chargeType.getName());
+        }
         return musicGroup;
     }
 }

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -250,10 +250,7 @@
         </if>
     </select>
     <select id="queryNameByIds" resultType="java.util.Map" parameterType="list">
-        select id_ `key`,real_name_ `value` FROM sys_user s WHERE id_ IN
-        <foreach item="item" index="index" collection="userIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        select id_ `key`,real_name_ `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds})
     </select>
 
     <select id="findTeachers" resultMap="Teacher">
@@ -400,6 +397,9 @@
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
         <include refid="queryTeacherAttendanceSql"/>
     </select>
+    <select id="queryNameById" resultType="java.lang.String">
+        select real_name_ FROM sys_user s WHERE id_ = #{userId}
+    </select>
 
     <sql id="queryCloses">
         <where>

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -49,7 +49,7 @@ public class MusicGroupController extends BaseController {
     @GetMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('musicGroup/get')")
     public Object get(String musicGroupId){
-        return succeed(musicGroupService.get(musicGroupId));
+        return succeed(musicGroupService.getMusicGroupDetail(musicGroupId));
     }
 
     @ApiOperation(value = "分页查询乐团列表")