update

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

@@ -2,7 +2,10 @@ 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.math.BigDecimal;
 import java.util.List;
 
 public class SubFeeSettingDto {
@@ -30,6 +33,9 @@ public class SubFeeSettingDto {
 
     @ApiModelProperty(value = "乐团状态（修改时用）",required = false)
     private MusicGroupStatusEnum musicGroupStatus;
+    
+    @ApiModelProperty(value = "分部乐器分润上限",required = false)
+    private BigDecimal maxMusicalInstrumentsProfits;
 
     public MusicGroupStatusEnum getMusicGroupStatus() {
         return musicGroupStatus;
@@ -94,4 +100,12 @@ public class SubFeeSettingDto {
     public void setSubjectRegisters(List<SubjectRegisterDto> subjectRegisters) {
         this.subjectRegisters = subjectRegisters;
     }
+
+	public BigDecimal getMaxMusicalInstrumentsProfits() {
+		return maxMusicalInstrumentsProfits;
+	}
+
+	public void setMaxMusicalInstrumentsProfits(BigDecimal maxMusicalInstrumentsProfits) {
+		this.maxMusicalInstrumentsProfits = maxMusicalInstrumentsProfits;
+	}
 }

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

@@ -212,7 +212,28 @@ public class MusicGroup extends BaseEntity {
 	
 	@ApiModelProperty(value = "第一节课实际开始时间",required = false)
 	private Date firstCourseStartTime;
-
+	
+	@ApiModelProperty(value = "建团编制",required = false)
+	private Integer musicGroupPlanMakingId;
+	
+	@ApiModelProperty(value = "成团年级",required = false)
+	private Integer firstRecruitGrade;
+	
+	@ApiModelProperty(value = "默认收费标准",required = false)
+	private BigDecimal defaultChargeStandard;
+	
+	@ApiModelProperty(value = "单次训练时长",required = false)
+	private String singleTrainMinutes;
+	
+	@ApiModelProperty(value = "课程计划",required = false)
+	private String coursePlan;
+	
+	@ApiModelProperty(value = "销售活动描述",required = false)
+	private String saleActivityDesc;
+	
+	@ApiModelProperty(value = "毕业年级",required = false)
+	private Integer graduateGrade;
+	
 	public String getMusicalInstrumentsProvideTime() {
 		return musicalInstrumentsProvideTime;
 	}
@@ -734,4 +755,60 @@ public class MusicGroup extends BaseEntity {
 	public void setFirstCourseStartTime(Date firstCourseStartTime) {
 		this.firstCourseStartTime = firstCourseStartTime;
 	}
+
+	public Integer getMusicGroupPlanMakingId() {
+		return musicGroupPlanMakingId;
+	}
+
+	public void setMusicGroupPlanMakingId(Integer musicGroupPlanMakingId) {
+		this.musicGroupPlanMakingId = musicGroupPlanMakingId;
+	}
+
+	public Integer getFirstRecruitGrade() {
+		return firstRecruitGrade;
+	}
+
+	public void setFirstRecruitGrade(Integer firstRecruitGrade) {
+		this.firstRecruitGrade = firstRecruitGrade;
+	}
+
+	public BigDecimal getDefaultChargeStandard() {
+		return defaultChargeStandard;
+	}
+
+	public void setDefaultChargeStandard(BigDecimal defaultChargeStandard) {
+		this.defaultChargeStandard = defaultChargeStandard;
+	}
+
+	public String getSingleTrainMinutes() {
+		return singleTrainMinutes;
+	}
+
+	public void setSingleTrainMinutes(String singleTrainMinutes) {
+		this.singleTrainMinutes = singleTrainMinutes;
+	}
+
+	public String getCoursePlan() {
+		return coursePlan;
+	}
+
+	public void setCoursePlan(String coursePlan) {
+		this.coursePlan = coursePlan;
+	}
+
+	public String getSaleActivityDesc() {
+		return saleActivityDesc;
+	}
+
+	public void setSaleActivityDesc(String saleActivityDesc) {
+		this.saleActivityDesc = saleActivityDesc;
+	}
+
+	public Integer getGraduateGrade() {
+		return graduateGrade;
+	}
+
+	public void setGraduateGrade(Integer graduateGrade) {
+		this.graduateGrade = graduateGrade;
+	}
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -44,6 +45,8 @@ public class Organization extends BaseEntity {
 	
 	private String corporateFinancialSeal;
 	
+	private BigDecimal maxMusicalInstrumentsProfits;
+	
 	/** 创建时间 */
 	private Date createTime;
 	
@@ -213,4 +216,12 @@ public class Organization extends BaseEntity {
 		this.corporateFinancialSeal = corporateFinancialSeal;
 	}
 
+	public BigDecimal getMaxMusicalInstrumentsProfits() {
+		return maxMusicalInstrumentsProfits;
+	}
+
+	public void setMaxMusicalInstrumentsProfits(BigDecimal maxMusicalInstrumentsProfits) {
+		this.maxMusicalInstrumentsProfits = maxMusicalInstrumentsProfits;
+	}
+
 }

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

@@ -3433,6 +3433,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         subFeeSettingDto.setMusicGroup(musicGroup);
         //获取付费主体
         subFeeSettingDto.setMusicGroupPaymentEntities(musicGroupPaymentEntitiesDao.findByMusicGroupId(musicGroupId));
+        subFeeSettingDto.setMaxMusicalInstrumentsProfits(organizationDao.get(musicGroup.getOrganId()).getMaxMusicalInstrumentsProfits());
         //获取缴费周期
         //List<Integer> paymentMonth = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId).stream().map(e -> e.getPaymentMonth()).collect(Collectors.toList());
         //subFeeSettingDto.setMonths(paymentMonth);

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

@@ -50,6 +50,13 @@
         <result column="homework_push_flag_" property="homeworkPushFlag"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="is_give_accessories_" property="isGiveAccessories"/>
+        <result column="music_group_plan_making_id_" property="musicGroupPlanMakingId"/>
+        <result column="first_recruit_grade_" property="firstRecruitGrade"/>
+        <result column="default_charge_standard_" property="defaultChargeStandard"/>
+        <result column="single_train_minutes_" property="singleTrainMinutes"/>
+        <result column="course_plan_" property="coursePlan"/>
+        <result column="sale_activity_desc_" property="saleActivityDesc"/>
+        <result column="graduate_grade_" property="graduateGrade"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -109,7 +116,8 @@
                  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_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_,extracurricular_teacher_,first_course_start_time_)
+                 payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_,extracurricular_teacher_,first_course_start_time_,
+                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
@@ -122,7 +130,8 @@
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
                 #{delFlag}, #{paymentValidStartDate}, #{paymentValidEndDate}, #{paymentPattern},
                 #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag},#{tenantId},#{isGiveAccessories},
-                #{extracurricularTeacher,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{firstCourseStartTime})
+                #{extracurricularTeacher,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{firstCourseStartTime},
+                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -246,6 +255,27 @@
             <if test="firstCourseStartTime != null">
                 first_course_start_time_ = #{firstCourseStartTime},
             </if>
+            <if test="musicGroupPlanMakingId != null">
+                music_group_plan_making_id_ = #{musicGroupPlanMakingId},
+            </if>
+            <if test="firstRecruitGrade != null">
+                first_recruit_grade_ = #{firstRecruitGrade},
+            </if>
+            <if test="defaultChargeStandard != null">
+                default_charge_standard_ = #{defaultChargeStandard},
+            </if>
+            <if test="singleTrainMinutes != null">
+                single_train_minutes_ = #{singleTrainMinutes},
+            </if>
+            <if test="coursePlan != null">
+                course_plan_ = #{coursePlan},
+            </if>
+            <if test="saleActivityDesc != null">
+                sale_activity_desc_ = #{saleActivityDesc},
+            </if>
+            <if test="graduateGrade != null">
+                graduate_grade_ = #{graduateGrade},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -22,6 +22,7 @@
         <result column="corporate_code_" property="corporateCode"/>
         <result column="corporate_seal_" property="corporateSeal"/>
         <result column="corporate_financial_seal_" property="corporateFinancialSeal"/>
+        <result column="max_musical_instruments_profits_" property="maxMusicalInstrumentsProfits"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="grade_type_" property="gradeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -40,9 +41,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,
-                                  register_date_,linkman_,mobile_,address_,grade_type_,tenant_id_,corporate_name_,corporate_code_,corporate_seal_,corporate_financial_seal_)
+                                  register_date_,linkman_,mobile_,address_,grade_type_,tenant_id_,corporate_name_,corporate_code_,corporate_seal_,corporate_financial_seal_,max_musical_instruments_profits_)
         VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},
-               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId},#{corporateName},#{corporateCode},#{corporateSeal},#{corporateFinancialSeal})
+               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId},#{corporateName},#{corporateCode},#{corporateSeal},#{corporateFinancialSeal},#{maxMusicalInstrumentsProfits})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -85,6 +86,9 @@
             <if test="corporateFinancialSeal != null">
                 corporate_financial_seal_ = #{corporateFinancialSeal},
             </if>
+            <if test="maxMusicalInstrumentsProfits != null">
+                max_musical_instruments_profits_ = #{maxMusicalInstrumentsProfits},
+            </if>
             <if test="gradeType != null">
                 grade_type_ = #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>