fix

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

@@ -1,11 +1,13 @@
 package com.ym.mec.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum DegreeTypeEnum implements BaseEnum<String, ComplaintsStatusEnum> {
     GRADE("GRADE", "等级"),
     THEORY("THEORY", "乐理");
 
+    @EnumValue
     private String code;
 
     private String msg;

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

@@ -7,11 +7,10 @@ import com.google.common.collect.Lists;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
 import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.enums.degree.EDegreeFeeType;
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
@@ -23,7 +22,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import java.util.List;
 
 /**
  * 考级等级费用配置
@@ -90,7 +88,7 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
     public DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFeeConfig(Integer tenantId) {
 
         // 根据机构ID查询考级价格配置
-        Map<EDegreeFeeType, List<DegreeLevelFeeNew>> collect = lambdaQuery().eq(DegreeLevelFeeNew::getTenantId, tenantId).list().stream()
+        Map<DegreeTypeEnum, List<DegreeLevelFeeNew>> collect = lambdaQuery().eq(DegreeLevelFeeNew::getTenantId, tenantId).list().stream()
                 .collect(Collectors.groupingBy(DegreeLevelFeeNew::getDegreeType));
 
         // 考级价格信息
@@ -101,7 +99,7 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
                 .build();
 
         // 考级价格配置
-        for (Map.Entry<EDegreeFeeType, List<DegreeLevelFeeNew>> entry : collect.entrySet()) {
+        for (Map.Entry<DegreeTypeEnum, List<DegreeLevelFeeNew>> entry : collect.entrySet()) {
 
             switch (entry.getKey()) {
                 case GRADE: // 考级