增加获取学生、乐团对应的年级列表

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

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum FivePlusGradeEnum implements BaseEnum<Integer, FivePlusGradeEnum> {
+	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 FivePlusGradeEnum(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -0,0 +1,37 @@
+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;
+	}
+
+}

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

@@ -1,11 +1,13 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface OrganizationService extends BaseService<Integer, Organization> {
 
@@ -27,4 +29,10 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      * @return
      */
     String getOrganName(String organId);
+
+    /**
+     * 获取分部学年制的年级列表
+     * @param id
+     */
+    Map<Integer, String> getGradeList(Integer id);
 }

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

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.List;
+import java.util.*;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
+import com.ym.mec.biz.dal.enums.GradeTypeEnum;
+import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
 import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,7 +21,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
 public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
-	
+
 	@Autowired
 	private OrganizationDao organizationDao;
 	@Autowired
@@ -54,7 +57,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 
-	private Organization getTree(Organization org){
+    private Organization getTree(Organization org){
 		//得到根节点对象
 		//获取子节点list
 		List<Organization> byParentId = organizationDao.findByParentId(org.getId(), null);
@@ -69,4 +72,24 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 			return org;
 	}
+
+	@Override
+	public Map<Integer, String> getGradeList(Integer id) {
+		Organization organization = organizationDao.get(id);
+		Map<Integer, String> gradeMap = new HashMap<>();
+
+		if(organization.getGradeType().equals(GradeTypeEnum.FIVE_PLUS)){
+			FivePlusGradeEnum[] fivePlusGradeEnums = FivePlusGradeEnum.values();
+			for (FivePlusGradeEnum fivePlusGradeEnum : fivePlusGradeEnums) {
+				gradeMap.put(fivePlusGradeEnum.getCode(),fivePlusGradeEnum.getDesc());
+			}
+		}
+		if(organization.getGradeType().equals(GradeTypeEnum.SIX_PLUS)){
+			SixPlusGradeEnum[] sixPlusGradeEnums = SixPlusGradeEnum.values();
+			for (SixPlusGradeEnum sixPlusGradeEnum : sixPlusGradeEnums) {
+				gradeMap.put(sixPlusGradeEnum.getCode(),sixPlusGradeEnum.getDesc());
+			}
+		}
+		return gradeMap;
+	}
 }

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

@@ -1,5 +1,8 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.dao.OrganizationDao;
+import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -24,25 +27,13 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
 import com.ym.mec.biz.dal.dao.StudentPreRegistrationDao;
 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.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-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.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -72,6 +63,8 @@ public class MusicGroupController extends BaseController {
     
     @Autowired
     private StudentPreRegistrationDao studentPreRegistrationDao;
+    @Autowired
+    private OrganizationService organizationService;
     
     @ApiOperation("预报名")
     @PostMapping(value = "/preRegister")
@@ -348,4 +341,12 @@ public class MusicGroupController extends BaseController {
 
         return succeed(orderDetail);
     }
+
+    @ApiOperation(value = "获取乐团的年级列表")
+    @GetMapping("/getGradeList")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
+    public HttpResponseResult getGradeList(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+        return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
+    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -1,10 +1,11 @@
 package com.ym.mec.student.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.*;
 
 import java.util.Date;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -22,15 +23,6 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ImGroupNoticeService;
-import com.ym.mec.biz.service.StudentManageService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
@@ -59,6 +51,8 @@ public class StudentManageController extends BaseController {
     private StudentManageService studentManageService;
     @Autowired
     private SubjectService subjectService;
+    @Autowired
+    private OrganizationService organizationService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -210,4 +204,14 @@ public class StudentManageController extends BaseController {
         return succeed(subjectService.findSubSubjects(tenantId));
     }
 
+    @ApiOperation(value = "获取用户所在分部的年级列表）")
+    @GetMapping("studentManage/getGradeList")
+    public HttpResponseResult<Map<Integer,String>> getGradeList() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请重新登录");
+        }
+        return succeed(organizationService.getGradeList(sysUser.getOrganId()));
+    }
+
 }