Merge remote-tracking branch 'origin/master'

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

@@ -34,7 +34,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     int queryStudentDetailCount(Map<String, Object> params);
 
     /**
-     * 根据乐团编号和声部获取缴费学员人数
+     * 根据乐团编号获取缴费学员人数
      *
      * @param musicGroupId
      * @return

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SubFeeSettingDto.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.util.List;
 
 public class SubFeeSettingDto {

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

@@ -6,6 +6,8 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(music_group):
  */
@@ -131,6 +133,28 @@ public class MusicGroup {
 	@ApiModelProperty(value = "备注",required = true)
 	private String memo;
 
+	@ApiModelProperty(value = "预计开团日期",required = true)
+	private Date expectStartGroupDate;
+
+	@ApiModelProperty(value = "成团人数",required = true)
+	private Integer groupMemberNum;
+
+	public Date getExpectStartGroupDate() {
+		return expectStartGroupDate;
+	}
+
+	public void setExpectStartGroupDate(Date expectStartGroupDate) {
+		this.expectStartGroupDate = expectStartGroupDate;
+	}
+
+	public Integer getGroupMemberNum() {
+		return groupMemberNum;
+	}
+
+	public void setGroupMemberNum(Integer groupMemberNum) {
+		this.groupMemberNum = groupMemberNum;
+	}
+
 	public String getCooperationOrganName() {
 		return cooperationOrganName;
 	}

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

@@ -57,6 +57,15 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      */
     int batchUpdateFee(List<MusicGroupSubjectPlan> musicGroupSubjectPlans);
 
+
+    /**
+     * 根据科目编号和乐团编号获取乐团规划
+     * @param musicGroupId
+     * @param subjectId
+     * @return
+     */
+    MusicGroupSubjectPlan findSubjectPlan(String musicGroupId, Integer subjectId);
+
     /**
      * 中途添加的学生的缴费信息
      *

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

@@ -259,6 +259,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
+        //获取所有已缴费学员人数
+        List<StudentRegistration> studentRegistrations = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
+        musicGroup.setGroupMemberNum(studentRegistrations == null?0:studentRegistrations.size());
         musicGroupDao.update(musicGroup);
         //3.0发送该消息
         /*if(new Integer(3).equals(musicGroup.getChargeTypeId())){

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

@@ -160,4 +160,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setOtherGoods(otherGoods);
         return musicGroupSubjectGoodsAndInfo;
     }
+
+
+    @Override
+    public MusicGroupSubjectPlan findSubjectPlan(String musicGroupId, Integer subjectId) {
+        return musicGroupSubjectPlanDao.findSubjectPlan(musicGroupId,subjectId);
+    }
 }

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

@@ -27,6 +27,8 @@
 		<result column="img_" property="img" />
 		<result column="director_user_id_" property="directorUserId" />
 		<result column="settlement_type_" property="settlementType" />
+		<result column="expect_start_group_date_" property="expectStartGroupDate" />
+		<result column="group_member_num_" property="groupMemberNum" />
 		<result column="memo_" property="memo" />
 	</resultMap>
 
@@ -51,11 +53,12 @@
 		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_,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_)
+		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_)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
 		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{settlementType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId},#{isClassroomLessons},#{memo})
+		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId},#{isClassroomLessons},#{memo},#{expectStartGroupDate})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -128,6 +131,12 @@
 			<if test="isClassroomLessons != null">
 				is_classroom_lessons_ = #{isClassroomLessons},
 			</if>
+			<if test="expectStartGroupDate != null">
+				expect_start_group_date_ = #{expectStartGroupDate},
+			</if>
+			<if test="groupMemberNum != null">
+				group_member_num_ = #{groupMemberNum},
+			</if>
 			<if test="memo != null">
 				memo_ = #{memo},
 			</if>