Browse Source

update:预报名

yonge 4 năm trước cách đây
mục cha
commit
ef2922e1e1

+ 12 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPreRegistrationDao.java

@@ -0,0 +1,12 @@
+package com.ym.mec.biz.dal.dao;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface StudentPreRegistrationDao extends BaseDAO<Long, StudentPreRegistration> {
+
+	StudentPreRegistration queryByUserId(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
+
+}

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

@@ -46,6 +46,9 @@ public class MusicGroup {
 	/** 报名截止日期 */
 	@ApiModelProperty(value = "报名截止日期",required = false)
 	private java.util.Date applyExpireDate;
+
+	@ApiModelProperty(value = "预报名截止日期",required = false)
+	private java.util.Date preApplyExpireDate;
 	
 	/** 团长 */
 	@ApiModelProperty(value = "运营主管",required = false)
@@ -359,6 +362,14 @@ public class MusicGroup {
 		return this.applyExpireDate;
 	}
 			
+	public java.util.Date getPreApplyExpireDate() {
+		return preApplyExpireDate;
+	}
+
+	public void setPreApplyExpireDate(java.util.Date preApplyExpireDate) {
+		this.preApplyExpireDate = preApplyExpireDate;
+	}
+
 	public void setTeamTeacherId(Integer teamTeacherId){
 		this.teamTeacherId = teamTeacherId;
 	}

+ 157 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -0,0 +1,157 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(student_pre_registration):
+ */
+public class StudentPreRegistration {
+
+	/**  */
+	private Long id;
+	
+	private String musicGroupId;
+	
+	/** 用户编号 */
+	private Integer userId;
+	
+	/** 联系方式 */
+	private String phone;
+	
+	/** 学生姓名 */
+	private Integer userName;
+	
+	/** 性别 */
+	private boolean gender;
+	
+	/** 年级 */
+	private String currentGrade;
+	
+	/** 班级 */
+	private String currentClass;
+	
+	/** 第一专业 */
+	private Integer subjectFirst;
+	
+	/** 第二专业 */
+	private Integer subjectSecond;
+	
+	/** 是否允许调剂 */
+	private boolean isAllowAdjust;
+	
+	/** 乐器提供方式 */
+	private String kitPurchaseMethod;
+	
+	/** 创建时间 */
+	private java.util.Date createTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setPhone(String phone){
+		this.phone = phone;
+	}
+	
+	public String getPhone(){
+		return this.phone;
+	}
+			
+	public void setUserName(Integer userName){
+		this.userName = userName;
+	}
+	
+	public Integer getUserName(){
+		return this.userName;
+	}
+			
+	public void setGender(boolean gender){
+		this.gender = gender;
+	}
+	
+	public boolean isGender(){
+		return this.gender;
+	}
+			
+	public void setCurrentGrade(String currentGrade){
+		this.currentGrade = currentGrade;
+	}
+	
+	public String getCurrentGrade(){
+		return this.currentGrade;
+	}
+			
+	public void setCurrentClass(String currentClass){
+		this.currentClass = currentClass;
+	}
+	
+	public String getCurrentClass(){
+		return this.currentClass;
+	}
+			
+	public void setSubjectFirst(Integer subjectFirst){
+		this.subjectFirst = subjectFirst;
+	}
+	
+	public Integer getSubjectFirst(){
+		return this.subjectFirst;
+	}
+			
+	public void setSubjectSecond(Integer subjectSecond){
+		this.subjectSecond = subjectSecond;
+	}
+	
+	public Integer getSubjectSecond(){
+		return this.subjectSecond;
+	}
+			
+	public void setIsAllowAdjust(boolean isAllowAdjust){
+		this.isAllowAdjust = isAllowAdjust;
+	}
+	
+	public boolean getIsAllowAdjust(){
+		return this.isAllowAdjust;
+	}
+			
+	public void setKitPurchaseMethod(String kitPurchaseMethod){
+		this.kitPurchaseMethod = kitPurchaseMethod;
+	}
+	
+	public String getKitPurchaseMethod(){
+		return this.kitPurchaseMethod;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.common.entity.ImGroupMember;
@@ -24,6 +25,13 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @Author superzou
 	 */
 	String createGroup(SubFeeSettingDto subFeeSettingDto) throws Exception;
+	
+	/**
+	 * 预报名
+	 * @param studentPreRegistration
+	 * @return
+	 */
+	boolean preRegister(StudentPreRegistration studentPreRegistration);
 
 	/**
 	 * 零星缴费
@@ -108,6 +116,14 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	boolean extensionApplyExpireDate(String musicGroupId, Date expireDate);
 
 	/**
+	 * 延长预报名时间
+	 * @param musicGroupId 乐团编号
+	 * @param expireDate 预报名的截止日期
+	 * @return
+	 */
+	boolean extensionPreApplyExpireDate(String musicGroupId, Date expireDate);
+
+	/**
 	 * 申请退团
 	 * @param musicGroupId 乐团编号
 	 * @param reason

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/StudentPreRegistrationService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
+import com.ym.mec.common.service.BaseService;
+
+public interface StudentPreRegistrationService extends BaseService<Long, StudentPreRegistration> {
+
+}

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

@@ -209,6 +209,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private StudentVisitDao studentVisitDao;
     @Autowired
     private SubjectDao subjectDao;
+    
+    @Autowired
+    private StudentPreRegistrationDao studentPreRegistrationDao;
 
     private SimpleDateFormat sdf_ymd = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -338,6 +341,34 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+	public boolean preRegister(StudentPreRegistration studentPreRegistration) {
+    	Integer userId = studentPreRegistration.getUserId();
+    	
+    	String musicGroupId = studentPreRegistration.getMusicGroupId();
+    	
+    	//查询乐团状态
+    	MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+    	if(musicGroup == null){
+    		throw new BizException("乐团信息查询失败");
+    	}
+    	if(musicGroup.getStatus() != MusicGroupStatusEnum.PRE_APPLY){
+    		throw new BizException("乐团当前状态不能预报名");
+    	}
+    	
+    	StudentPreRegistration originRegistration = studentPreRegistrationDao.queryByUserId(userId, musicGroupId);
+    	if(originRegistration != null){
+    		throw new BizException("您已预报名成功,请勿重复提交资料");
+    	}
+    	Date date = new Date();
+    	
+    	studentPreRegistration.setCreateTime(date);
+    	
+    	studentPreRegistrationDao.update(studentPreRegistration);
+    	
+		return true;
+	}
+
+	@Override
     @Transactional(rollbackFor = Exception.class)
     public Map sporadicPay(SporadicPayDto sporadicPayDto) throws Exception {
         //获取收费项价格
@@ -1125,8 +1156,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         MusicGroup musicGroup = saveLog(musicGroupId, MusicGroupStatusEnum.AUDIT);
         //记录操作日志
-        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过(审核中 -> 报名)", sysUser.getId(), ""));
-        musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过(审核中 -> 报名)", sysUser.getId(), ""));
+        musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
         musicGroupDao.update(musicGroup);
         //获取报名缴费项目
         MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroupId);
@@ -1449,7 +1480,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
-            throw new BizException("乐团当前状态是{},不能延长缴费", musicGroup.getStatus().getMsg());
+            throw new BizException("乐团当前状态是[{}],不能延长缴费", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
@@ -1492,8 +1523,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团找不到");
         }
 
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY && musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
-            throw new BizException("乐团当前状态是{},不能延长报名", musicGroup.getStatus().getMsg());
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY || musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
+            throw new BizException("乐团当前状态是[{}],不能延长报名", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
@@ -1510,6 +1541,34 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+	public boolean extensionPreApplyExpireDate(String musicGroupId, Date expireDate) {
+    	SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if (musicGroup == null) {
+            throw new BizException("乐团找不到");
+        }
+
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.PRE_APPLY) {
+            throw new BizException("乐团当前状态是[{}],不能延长预报名", musicGroup.getStatus().getMsg());
+        }
+
+        Date date = new Date();
+
+        if (date.after(expireDate)) {
+            throw new BizException("日期设置错误");
+        }
+
+        musicGroup.setPreApplyExpireDate(expireDate);
+        musicGroup.setUpdateTime(date);
+        musicGroupDao.update(musicGroup);
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "延长预报名时间", sysUser.getId(), ""));
+        return true;
+	}
+
+	@Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public boolean applyQuitMusicGroup(String musicGroupId, String reason) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

+ 23 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPreRegistrationServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.StudentPreRegistrationDao;
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
+import com.ym.mec.biz.service.StudentPreRegistrationService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class StudentPreRegistrationServiceImpl extends BaseServiceImpl<Long, StudentPreRegistration>  implements StudentPreRegistrationService {
+	
+	@Autowired
+	private StudentPreRegistrationDao studentPreRegistrationDao;
+
+	@Override
+	public BaseDAO<Long, StudentPreRegistration> getDAO() {
+		return studentPreRegistrationDao;
+	}
+	
+}

+ 6 - 2
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -9,6 +9,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="school_id_" property="schoolId"/>
         <result column="apply_expire_date_" property="applyExpireDate"/>
+        <result column="pre_apply_expire_date_" property="preApplyExpireDate"/>
         <result column="team_teacher_id_" property="teamTeacherId"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
         <result column="charge_type_id_" property="chargeTypeId"/>
@@ -66,13 +67,13 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group
-        (id_, name_, organ_id_, school_id_, apply_expire_date_, team_teacher_id_, educational_teacher_id_,
+        (id_, name_, organ_id_, school_id_, apply_expire_date_,pre_apply_expire_date_, team_teacher_id_, educational_teacher_id_,
          charge_type_id_, course_form_, create_time_, update_time_, status_,
          bill_start_date_, improvent_classes_num_, enroll_classes_, payment_expire_date_, is_extra_class_,
          settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
          parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
          ownership_type_, repair_user_id_, del_flag_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_)
-        VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{teamTeacherId}, #{educationalTeacherId},
+        VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate},#{preApplyExpireDate}, #{teamTeacherId}, #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
                 #{improventClassesNum}, #{enrollClasses}, #{paymentExpireDate},
@@ -135,6 +136,9 @@
             <if test="applyExpireDate != null">
                 apply_expire_date_ = #{applyExpireDate},
             </if>
+            <if test="preApplyExpireDate != null">
+                pre_apply_expire_date_ = #{preApplyExpireDate},
+            </if>
             <if test="billStartDate != null">
                 bill_start_date_ = #{billStartDate},
             </if>

+ 108 - 0
mec-biz/src/main/resources/config/mybatis/StudentPreRegistrationMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.StudentPreRegistrationDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.StudentPreRegistration" id="StudentPreRegistration">
+		<result column="id_" property="id" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="user_id_" property="userId" />
+		<result column="phone_" property="phone" />
+		<result column="user_name_" property="userName" />
+		<result column="gender_" property="gender" />
+		<result column="current_grade_" property="currentGrade" />
+		<result column="current_class_" property="currentClass" />
+		<result column="subject_first_" property="subjectFirst" />
+		<result column="subject_second_" property="subjectSecond" />
+		<result column="is_allow_adjust_" property="isAllowAdjust" />
+		<result column="kit_purchase_method_" property="kitPurchaseMethod" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="StudentPreRegistration" >
+		SELECT * FROM student_pre_registration WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="StudentPreRegistration">
+		SELECT * FROM student_pre_registration ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPreRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO student_pre_registration (id_,music_group_id_,user_id_,phone_,user_name_,gender_,current_grade_,current_class_,subject_first_,subject_second_,is_allow_adjust_,kit_purchase_method_,create_time_) VALUES(#{id},#{musicGroupId},#{userId},#{phone},#{userName},#{gender},#{currentGrade},#{currentClass},#{subjectFirst},#{subjectSecond},#{isAllowAdjust},#{kitPurchaseMethod},#{createTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentPreRegistration">
+		UPDATE student_pre_registration <set>
+		<if test="musicGroupId != null">
+		music_group_id_ = #{musicGroupId},
+		</if>
+		<if test="userId != null">
+		user_id_ = #{userId},
+		</if>
+		<if test="userName != null">
+		user_name_ = #{userName},
+		</if>
+		<if test="id != null">
+		id_ = #{id},
+		</if>
+		<if test="currentGrade != null">
+		current_grade_ = #{currentGrade},
+		</if>
+		<if test="gender != null">
+		gender_ = #{gender},
+		</if>
+		<if test="subjectFirst != null">
+		subject_first_ = #{subjectFirst},
+		</if>
+		<if test="phone != null">
+		phone_ = #{phone},
+		</if>
+		<if test="subjectSecond != null">
+		subject_second_ = #{subjectSecond},
+		</if>
+		<if test="currentClass != null">
+		current_class_ = #{currentClass},
+		</if>
+		<if test="isAllowAdjust != null">
+		is_allow_adjust_ = #{isAllowAdjust},
+		</if>
+		<if test="kitPurchaseMethod != null">
+		kit_purchase_method_ = #{kitPurchaseMethod},
+		</if>
+		<if test="createTime != null">
+		create_time_ = #{createTime},
+		</if>
+		</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM student_pre_registration WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="StudentPreRegistration" parameterType="map">
+		SELECT * FROM student_pre_registration ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM student_pre_registration
+	</select>
+	
+	<select id="queryByUserId" resultMap="StudentPreRegistration" parameterType="map">
+		SELECT * FROM student_pre_registration WHERE user_id_ = #{userId} and music_group_id_ = #{musicGroupId}
+	</select>
+</mapper>

+ 13 - 0
mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -30,6 +30,7 @@ import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.StudentPreRegistration;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -71,6 +72,18 @@ public class MusicGroupController extends BaseController {
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
     @Autowired
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    
+    @ApiOperation("预报名")
+    @PostMapping(value = "/preRegister")
+	public Object preRegister(@RequestBody StudentPreRegistration studentPreRegistration) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		studentPreRegistration.setUserId(sysUser.getId());
+
+		return musicGroupService.preRegister(studentPreRegistration) ? succeed() : failed();
+	}
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryUserMusicGroups")

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

@@ -199,7 +199,7 @@ public class MusicGroupController extends BaseController {
 		return succeed();
 	}
 
-	@ApiOperation(value = "审核通过(审核中 -> 报名)")
+	@ApiOperation(value = "审核通过(审核中 -> 报名)")
 	@PostMapping("/auditSuccess")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/auditSuccess')")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
@@ -273,6 +273,16 @@ public class MusicGroupController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "延长预报名时间")
+	@PostMapping("/extensionPreApplyExpireDate")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/extensionApplyExpireDate')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "expireDate", value = "延长预报名的截止日期", required = true, dataType = "Date") })
+	public Object extensionPreApplyExpireDate(String musicGroupId, Date expireDate) {
+		musicGroupService.extensionPreApplyExpireDate(musicGroupId, expireDate);
+		return succeed();
+	}
+
 	@ApiOperation("获取分部乐团列表名称")
 	@GetMapping(value = "/queryOrganMusicInfos")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryOrganMusicInfos')")