乐团年级分布

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/EGroupGradeType.java

@@ -31,4 +31,12 @@ public enum EGroupGradeType implements BaseEnum<String, EGroupGradeType> {
         this.msg = msg;
     }
 
+    public static EGroupGradeType get(String code) {
+        for (EGroupGradeType vpg : EGroupGradeType.values()) {
+            if (vpg.getCode().equals(code)) {
+                return vpg;
+            }
+        }
+        return null;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/FivePlusGradeEnum.java

@@ -43,4 +43,24 @@ public enum FivePlusGradeEnum implements BaseEnum<Integer, FivePlusGradeEnum> {
 		return null;
 	}
 
+
+    public static FivePlusGradeEnum[] getArray(EGroupGradeType gradeType) {
+        if (gradeType == null) {
+            return FivePlusGradeEnum.values();
+        }
+        switch (gradeType) {
+            case PRIMARY:
+                return new FivePlusGradeEnum[] {GRADE1, GRADE2, GRADE3, GRADE4, GRADE5};
+            case MIDDLE:
+                return new FivePlusGradeEnum[] {GRADE6,GRADE7, GRADE8, GRADE9};
+            case HIGH:
+                return new FivePlusGradeEnum[] {GRADE10, GRADE11, GRADE12};
+            case MIXED:
+                return  new FivePlusGradeEnum[] {GRADE1, GRADE2, GRADE3, GRADE4, GRADE5, GRADE6, GRADE7, GRADE8, GRADE9};
+            default:
+                return FivePlusGradeEnum.values();
+        }
+
+    }
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SixPlusGradeEnum.java

@@ -3,44 +3,63 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum SixPlusGradeEnum implements BaseEnum<Integer, SixPlusGradeEnum> {
-	GRADE1(1, "一年级"),
-	GRADE2(2, "二年级"),
-	GRADE3(3, "三年级"),
-	GRADE4(4, "四年级"),
-	GRADE5(5, "五年级"),
-	GRADE6(6, "六年级"),
-	GRADE7(7, "七年级/初一"),
-	GRADE8(8, "八年级/初二"),
-	GRADE9(9, "九年级/初三"),
-	GRADE10(10, "高一"),
-	GRADE11(11, "高二"),
-	GRADE12(12, "高三");
-
-	private Integer code;
-
-	private String desc;
-
-	private SixPlusGradeEnum(Integer code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
-
-	@Override
-	public Integer getCode() {
-		return code;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-	
-	public static SixPlusGradeEnum get(String desc) {
-		for (SixPlusGradeEnum vpg : SixPlusGradeEnum.values()) {
-			if (vpg.getDesc().equals(desc)) {
-				return vpg;
-			}
-		}
-		return null;
-	}
+    GRADE1(1, "一年级"),
+    GRADE2(2, "二年级"),
+    GRADE3(3, "三年级"),
+    GRADE4(4, "四年级"),
+    GRADE5(5, "五年级"),
+    GRADE6(6, "六年级"),
+    GRADE7(7, "七年级/初一"),
+    GRADE8(8, "八年级/初二"),
+    GRADE9(9, "九年级/初三"),
+    GRADE10(10, "高一"),
+    GRADE11(11, "高二"),
+    GRADE12(12, "高三");
+
+    private Integer code;
+
+    private String desc;
+
+    private SixPlusGradeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static SixPlusGradeEnum get(String desc) {
+        for (SixPlusGradeEnum vpg : SixPlusGradeEnum.values()) {
+            if (vpg.getDesc().equals(desc)) {
+                return vpg;
+            }
+        }
+        return null;
+    }
+
+    public static SixPlusGradeEnum[] getArray(EGroupGradeType gradeType) {
+        if (gradeType == null) {
+            return SixPlusGradeEnum.values();
+        }
+        switch (gradeType) {
+            case PRIMARY:
+                return new SixPlusGradeEnum[] {GRADE1, GRADE2, GRADE3, GRADE4, GRADE5, GRADE6};
+            case MIDDLE:
+                return new SixPlusGradeEnum[] {GRADE7, GRADE8, GRADE9};
+                case HIGH:
+                return new SixPlusGradeEnum[] {GRADE10, GRADE11, GRADE12};
+            case MIXED:
+                return  new SixPlusGradeEnum[] {GRADE1, GRADE2, GRADE3, GRADE4, GRADE5, GRADE6, GRADE7, GRADE8, GRADE9};
+            default:
+                return SixPlusGradeEnum.values();
+        }
+
+    }
 
 }

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.enums.EGroupGradeType;
 import com.ym.mec.biz.dal.page.EducationBaseQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -95,4 +96,11 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      * @param organIds 分部id
      */
     Map<Integer,Organization> getMapByIds(List<Integer> organIds);
+
+    /**
+     * 获取分部学年制的年级列表
+     * @param organId 分部id
+     * @param gradeType 年级类型
+     */
+    Map<Integer, String> getGradeList(Integer organId, EGroupGradeType gradeType);
 }

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

@@ -448,6 +448,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("获取用户信息失败");
         }
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
+        if (StringUtils.isBlank(musicGroup.getGradeType()) && StringUtils.isNotBlank(subFeeSettingDto.getGradeType())) {
+            musicGroup.setGradeType(subFeeSettingDto.getGradeType());
+        }
         List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups = subFeeSettingDto.getMusicGroupSubjectGoodsGroups();
         List<MusicGroupSubjectPlan> musicGroupSubjectPlans = subFeeSettingDto.getMusicGroupSubjectPlans();
         List<SubjectRegisterDto> subjectRegisters = subFeeSettingDto.getSubjectRegisters();
@@ -3254,6 +3257,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
         musicGroup.setStatus(group.getStatus());
+        if (StringUtils.isBlank(musicGroup.getGradeType()) && StringUtils.isNotBlank(subFeeSettingDto.getGradeType())) {
+            musicGroup.setGradeType(subFeeSettingDto.getGradeType());
+        }
         if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.TenantInfo;
+import com.ym.mec.biz.dal.enums.EGroupGradeType;
 import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
@@ -237,6 +238,31 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
     }
 
+
+    /**
+     * 获取分部学年制的年级列表
+     * @param organId 分部id
+     * @param gradeType 年级类型
+     */
+    @Override
+    public Map<Integer, String> getGradeList(Integer organId, EGroupGradeType gradeType) {
+        Organization organization = organizationDao.get(organId);
+        Map<Integer, String> gradeMap = new HashMap<>();
+
+        if(Objects.isNull(organization) || organization.getGradeType().equals(GradeTypeEnum.SIX_PLUS)){
+            SixPlusGradeEnum[] sixPlusGradeEnums = SixPlusGradeEnum.getArray(gradeType);
+            for (SixPlusGradeEnum sixPlusGradeEnum : sixPlusGradeEnums) {
+                gradeMap.put(sixPlusGradeEnum.getCode(),sixPlusGradeEnum.getDesc());
+            }
+        } else if(organization.getGradeType().equals(GradeTypeEnum.FIVE_PLUS)){
+            FivePlusGradeEnum[] fivePlusGradeEnums = FivePlusGradeEnum.getArray(gradeType);
+            for (FivePlusGradeEnum fivePlusGradeEnum : fivePlusGradeEnums) {
+                gradeMap.put(fivePlusGradeEnum.getCode(),fivePlusGradeEnum.getDesc());
+            }
+        }
+        return gradeMap;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void updateOrganId(Integer userId,Integer organId){
 		Employee employee = employeeDao.get(userId);

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

@@ -119,7 +119,7 @@
                  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_,
-                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_)
+                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_,grade_type_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{courseForm}, now(), now(),
@@ -133,7 +133,7 @@
                 #{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},
-                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade},#{basicStudentNum},#{paymentUserType},#{chargeMode})
+                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade},#{basicStudentNum},#{paymentUserType},#{chargeMode}.#{gradeType})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -284,6 +284,9 @@
             <if test="chargeMode != null">
                 charge_mode_ = #{chargeMode},
             </if>
+            <if test="gradeType != null and gradeType != ''">
+                grade_type_ = #{gradeType},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -80,6 +80,6 @@ public class OrganizationController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('organization/getGradeList')")
     @ApiParam(value = "分部编号", required = true)
     public HttpResponseResult<Map<Integer,String>> getGradeList(Integer id,@ApiParam("年级分布") EGroupGradeType gradeType){
-        return succeed(organizationService.getGradeList(id));
+        return succeed(organizationService.getGradeList(id,gradeType));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupRecordController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller.education;
 
+import com.ym.mec.biz.dal.enums.EGroupGradeType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -71,7 +72,7 @@ public class EduMusicGroupRecordController extends BaseController {
 
 		model.put("subject", studentRegistrationDao.countStudentWithSubjectByMusicGroupId(musicGroupId));
 		
-		model.put("gradeMap", organizationService.getGradeList(musicGroup.getOrganId()));
+		model.put("gradeMap", organizationService.getGradeList(musicGroup.getOrganId(), EGroupGradeType.get(musicGroup.getGradeType())));
 		model.put("grade", studentRegistrationDao.countStudentWithGradeByMusicGroupId(musicGroupId));
 		model.put("teacher", classGroupDao.countTeacherByMusicGroupId(musicGroupId));