Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1,24 +1,62 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.DegreeRegistration;
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 @Data
-public class DegreeRegistrationActivityDto extends DegreeRegistration {
+public class DegreeRegistrationActivityDto {
+    @ApiModelProperty(value = "考级编号",required = true)
+    private Long degreeId;
+
+    @ApiModelProperty(value = "学员编号",required = true)
+    private Integer userId;
+
+    @ApiModelProperty(value = "名字",required = true)
+    private String name;
+
+    @ApiModelProperty(value = "性别",required = true)
+    private String gender;
+
+    @ApiModelProperty(value = "证件类型",required = true)
+    private CertificateTypeEnum certificateType;
+
+    @ApiModelProperty(value = "身份证号",required = true)
+    private String idcard;
+
+    @ApiModelProperty(value = "城市",required = true)
+    private String city;
+
+    @ApiModelProperty(value = "学校",required = true)
+    private String school;
+
+    @ApiModelProperty(value = "声部",required = true)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "证书",required = true)
+    private String theoryCert;
+
+    @ApiModelProperty(value = "家长联系电话",required = true)
+    private String mobile;
+
+    @ApiModelProperty(value = "学员分部",required = true)
+    private Integer organId;
 
     @ApiModelProperty(value = "用户考级报名基本信息",required = true)
     private List<DegreeRegistrationDto> degreeRegistrationDtos;
 
-    @ApiModelProperty(value = "课程信息",required = true)
-    private Map<CourseSchedule.CourseScheduleType, Integer> additionCourseInfo;
-
+    @ApiModelProperty(value = "总金额",required = true)
     private BigDecimal price;
-    
+
+    @ApiModelProperty(value = "是否余额支付",required = true)
     private boolean isUseBalance;
+
+    @ApiModelProperty(value = "是否重新支付",required = false)
+    private Boolean isRepay = false;
+
+    private Integer tenantId = TenantContextHolder.getTenantId();
 }

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

@@ -18,9 +18,6 @@ public class DegreeRegistrationDto{
     @ApiModelProperty(value = "乐理级别证书",required = false)
     private String theoryCert;
 
-    @ApiModelProperty(value = "考级费用",required = false)
-    private BigDecimal money;
-
     @ApiModelProperty(value = "1乐器考级、2乐理考级",required = false)
     private DegreeTypeEnum type;
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,7 +34,7 @@ public class DegreeRegistration {
     private String gender;
 
     @ApiModelProperty(value = "证件类型",required = true)
-	private String certificateType;
+	private CertificateTypeEnum certificateType;
 
     @ApiModelProperty(value = "身份证号",required = true)
     private String idcard;
@@ -47,6 +48,8 @@ public class DegreeRegistration {
     @ApiModelProperty(value = "声部",required = true)
     private Integer subjectId;
 
+    private String subjectName;
+
     @ApiModelProperty(value = "考试级别",required = true)
     private String level;
 
@@ -80,8 +83,6 @@ public class DegreeRegistration {
 
     private Integer organId;
 
-//    private String activityTag;
-
     private String vipTeacherName;
 
     private String normalTeacherName;

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeLevelFeeMapper.java

@@ -26,5 +26,8 @@ public interface DegreeLevelFeeMapper extends BaseMapper<DegreeLevelFeeNew> {
 	 */
 	List<DegreeLevelFeeNewVo> selectPage(@Param("page") IPage<DegreeLevelFeeNewVo> page, @Param("param") DegreeLevelFeeWrapper.DegreeLevelFeeQuery param);
 
-    String checkSave(@Param("subjectId") Integer subjectId, @Param("degreeType") String degreeType, @Param("levels") String levels);
+    String checkSave(@Param("subjectId") Integer subjectId,
+					 @Param("degreeType") String degreeType,
+					 @Param("levels") String levels,
+					 @Param("degreeLevelFeeId") Integer degreeLevelFeeId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/DegreeQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -66,6 +67,12 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐器", required = true)
     private String subject;
 
+    @ApiModelProperty(value = "声部", required = true)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "考级类型",required = true)
+    private DegreeTypeEnum type;
+
     /**
      * 考试级别
      */
@@ -136,6 +143,22 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "0-未支付 1-支付中 2-已支付 2-已退费",required = false)
     private Integer status;
 
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public DegreeTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(DegreeTypeEnum type) {
+        this.type = type;
+    }
+
     public String getDegreeType() {
         return degreeType;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeNewsWrapper.java

@@ -36,7 +36,7 @@ public class DegreeNewsWrapper {
         @ApiModelProperty("关键字匹配")
 		private String keyword;
 
-        private String organId;
+        private Integer organId;
 
         @ApiModelProperty("用户所在分部")
         private String defaultOrganId;

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeWrapper.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.EDegreeStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -51,8 +53,15 @@ public class DegreeWrapper {
         @ApiModelProperty("报名状态 NOT_START:未开始,START:报名中,END:报名结束")
         private EDegreeStatus status;
 
+        @ApiModelProperty("机构ID")
         private Integer tenantId;
 
+        @ApiModelProperty("城市分部ID")
+        private Integer organId;
+
+        @ApiModelProperty("报名状态集合 NOT_START:未开始,START:报名中,END:报名结束")
+        private List<EDegreeStatus> degreeStatuses;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
@@ -64,7 +73,32 @@ public class DegreeWrapper {
         public static DegreeQuery from(String json) {
             return JSON.parseObject(json, DegreeQuery.class);
         }
-    }  
+
+        public DegreeQuery page(Integer page) {
+            this.page = page;
+            return this;
+        }
+
+        public DegreeQuery rows(Integer rows) {
+            this.rows = rows;
+            return this;
+        }
+
+        public DegreeQuery tenantId(Integer tenantId) {
+            this.tenantId = tenantId;
+            return this;
+        }
+
+        public DegreeQuery organId(Integer organId) {
+            this.organId = organId;
+            return this;
+        }
+
+        public DegreeQuery degreeStatuses(List<EDegreeStatus> degreeStatuses) {
+            this.degreeStatuses = degreeStatuses;
+            return this;
+        }
+    }
 
     @Data
 	@ApiModel(" Degree-考级信息")
@@ -146,4 +180,65 @@ public class DegreeWrapper {
         private BigDecimal courseIncome;
 
     }
+
+    @Data
+    @ApiModel(" Degree-考级信息")
+    public static class StudentDegreeInfo {
+
+
+        @ApiModelProperty("主键ID")
+        private Long id;
+
+        @ApiModelProperty("机构ID")
+        private Integer tenantId;
+
+        @ApiModelProperty(value = "分部ID")
+        private String organIds;
+
+        @ApiModelProperty("分部名称")
+        private List<Organization> organs;
+
+        @ApiModelProperty(value = "考级名称")
+        private String name;
+
+        @ApiModelProperty(value = "报名开始时间")
+        private Date startTime;
+
+        @ApiModelProperty(value = "报名结束时间")
+        private Date endTime;
+
+        @ApiModelProperty(value = "登记时间")
+        private Date registrationTime;
+
+        @ApiModelProperty("报名状态 NOT_START:未开始,START:报名中,END:报名结束")
+        private EDegreeStatus status;
+
+        @ApiModelProperty("考级城市分部")
+        private List<DegreeCity> degreeCities;
+
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static StudentDegreeInfo from(String json) {
+            return JSON.parseObject(json, StudentDegreeInfo.class);
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel("考级城市分部")
+    public static class DegreeCity implements Serializable {
+
+        @ApiModelProperty("主键ID")
+        private Integer id;
+
+        @ApiModelProperty(value = "机构名称")
+        private String name;
+
+        @ApiModelProperty(value = "区域编码")
+        private Integer areaId;
+    }
 }

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

@@ -29,20 +29,6 @@ public interface DegreeLevelFeeService extends IService<DegreeLevelFeeNew>  {
      * @return IPage<DegreeLevelFee>
      */
     IPage<DegreeLevelFeeNewVo> selectPage(IPage<DegreeLevelFeeNewVo> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query);
-	
-    /**
-     * 添加
-     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
-     * @return Boolean
-     */
-     Boolean add(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee);   
-
-    /**
-     * 更新
-     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
-     * @return Boolean
-     */
-     Boolean update(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee);
 
     /**
      * 机构考级价格配置
@@ -59,4 +45,6 @@ public interface DegreeLevelFeeService extends IService<DegreeLevelFeeNew>  {
     * @date 2023/4/11 19:43
     */
     void batchSave(List<DegreeLevelFeeNew> degreeLevelFees);
+
+    void update(DegreeLevelFeeNew degreeLevelFee);
 }

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

@@ -45,4 +45,11 @@ public interface DegreeService extends IService<Degree>  {
      * @param id 详情ID
      */
     DegreeWrapper.DegreeStatistical statistic(Long id);
+
+    /**
+     * 学生考级信息查询
+     * @param id 考级ID
+     * @return DegreeWrapper.StudentDegreeInfo
+     */
+    DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id);
 }

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

@@ -8,16 +8,16 @@ 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.DegreeTypeEnum;
+import com.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+import com.ym.mec.biz.service.DegreeLevelFeeService;
 import com.ym.mec.common.exception.BizException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
 import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
-import com.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper;
-import com.ym.mec.biz.service.DegreeLevelFeeService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -59,27 +59,6 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
         return page.setRecords(baseMapper.selectPage(page, query));
     }
 
-    /**
-     * 添加
-     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
-     * @return Boolean
-     */
-    @Override
-    public Boolean add(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee) {
-
-        return this.save(JSON.parseObject(degreeLevelFee.jsonString(), DegreeLevelFeeNew.class));
-    }
-
-    /**
-     * 更新
-     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
-     * @return Boolean
-     */
-    @Override
-    public Boolean update(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee){
-
-        return this.updateById(JSON.parseObject(degreeLevelFee.jsonString(), DegreeLevelFeeNew.class));
-    }
 
     /**
      * 机构考级价格配置
@@ -161,16 +140,38 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchSave(List<DegreeLevelFeeNew> degreeLevelFees) {
+        long count = degreeLevelFees.stream().map(e -> e.getLevel()).count();
+        if(count > 1){
+            throw new BizException("请勿录入重复的报考级别");
+        }
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);
-        Integer subjectId = degreeLevelFeeNew.getSubjectId();
-        DegreeTypeEnum degreeType = degreeLevelFeeNew.getDegreeType();
         String levels = degreeLevelFees.stream().map(e -> e.getLevel().toString()).collect(Collectors.joining(","));
-        String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels);
+        this.check(degreeLevelFeeNew.getSubjectId(),degreeLevelFeeNew.getDegreeType(),levels,null);
+        this.saveBatch(degreeLevelFees);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DegreeLevelFeeNew degreeLevelFee) {
+        this.check(degreeLevelFee.getSubjectId(),degreeLevelFee.getDegreeType(),degreeLevelFee.getLevel().toString(),degreeLevelFee.getId());
+        if(degreeLevelFee.getDegreeType() == DegreeTypeEnum.THEORY){
+            this.lambdaUpdate().eq(DegreeLevelFeeNew::getId,degreeLevelFee.getId())
+                    .set(DegreeLevelFeeNew::getLevel,degreeLevelFee.getLevel())
+                    .set(DegreeLevelFeeNew::getDegreeType,degreeLevelFee.getDegreeType())
+                    .set(DegreeLevelFeeNew::getFee,degreeLevelFee.getFee())
+                    .set(DegreeLevelFeeNew::getCredentials,degreeLevelFee.getCredentials())
+                    .set(DegreeLevelFeeNew::getSubjectId,null).update();
+        }else {
+            this.updateById(degreeLevelFee);
+        }
+    }
+
+    private void check(Integer subjectId,DegreeTypeEnum degreeType,String levels,Integer degreeLevelFeeId){
+        String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels,degreeLevelFeeId);
         if(StringUtils.isNotEmpty(level)){
             StringBuffer sb = new StringBuffer(degreeType.getMsg());
             sb.append("/级别").append(level).append("配置已存在");
             throw new BizException(sb.toString());
         }
-        this.saveBatch(degreeLevelFees);
     }
 }

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

@@ -23,12 +23,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,6 +55,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     @Autowired
     private DegreeService degreeService;
 
+    @Autowired
+    private SubjectService subjectService;
+
     @Override
     public BaseDAO<Integer, DegreeRegistration> getDAO() {
         return degreeRegistrationDao;
@@ -81,7 +84,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";
-        degreeRegistration.setOrderNo(orderNo);
         //获取收费项价格
         BigDecimal money = BigDecimal.ZERO;
         List<DegreeRegistrationDto> registrationDtos = degreeRegistration.getDegreeRegistrationDtos();
@@ -90,28 +92,35 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration degree = new DegreeRegistration();
             BeanUtils.copyProperties(degreeRegistration,degree);
             String level = registrationDto.getLevel();
+            degree.setOrderNo(orderNo);
             degree.setLevel(level);
             degree.setDegreeId(registrationDto.getDegreeId());
-            degree.setMoney(registrationDto.getMoney());
             degree.setTheoryCert(registrationDto.getTheoryCert());
             degree.setType(registrationDto.getType());
             degree.setStatus(1);
-            DegreeLevelFeeNew one = degreeLevelFeeService.lambdaQuery()
-                    .eq(DegreeLevelFeeNew::getSubjectId, degreeRegistration.getSubjectId())
-                    .eq(DegreeLevelFeeNew::getDegreeType, degreeRegistration.getType())
-                    .eq(DegreeLevelFeeNew::getLevel, degreeRegistration.getLevel()).one();
+            DegreeLevelFeeNew one;
+            if(registrationDto.getType() == DegreeTypeEnum.THEORY){
+                one = degreeLevelFeeService.lambdaQuery()
+                        .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+            }else {
+                one = degreeLevelFeeService.lambdaQuery()
+                        .eq(DegreeLevelFeeNew::getSubjectId, degreeRegistration.getSubjectId())
+                        .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+            }
             if(Objects.isNull(one)){
                 throw new BizException("该级别已不可报名");
             }
             degree.setMoney(one.getFee());
+            money = money.add(one.getFee());
             degreeRegistrationList.add(degree);
         }
-        degreeRegistrationDao.batchInsert(degreeRegistrationList);
-
         if(money.compareTo(degreeRegistration.getPrice())!=0){
             throw new BizException("商品价格不符");
         }
-        
+        degreeRegistrationDao.batchInsert(degreeRegistrationList);
+
         Integer userId = degreeRegistration.getUserId();
         String channelType = "";
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
@@ -145,11 +154,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             studentPaymentOrder.setBalancePaymentAmount(BigDecimal.ZERO);
         }
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
-        studentPaymentOrder.setClassGroupId(degreeRegistration.getId());
-        String collect = degreeRegistrationList.stream().map(e -> e.getDegreeId().toString()).collect(Collectors.joining(","));
-        if(StringUtils.isNotEmpty(collect)){
-            studentPaymentOrder.setMusicGroupId(collect);
-        }
+        studentPaymentOrder.setMusicGroupId(degreeRegistration.getDegreeId().toString());
         studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
         studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
         studentPaymentOrderService.insert(studentPaymentOrder);
@@ -262,6 +267,24 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 degreeRegistration.setVipTeacherName(vipTeacherMapper.get(degreeRegistration.getUserId()));
                 degreeRegistration.setNormalTeacherName(teacherMapper.get(degreeRegistration.getUserId()));
             }
+            // 设置声部
+            Set<Integer> subjectIdSet = dataList.stream().map(o -> o.getSubjectId()).filter(Objects::nonNull).collect(Collectors.toSet());
+
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(new ArrayList<>(subjectIdSet));
+
+            // id 分组
+            Map<Integer, Subject> subjectMap = subjectList.stream().collect(Collectors.toMap(Subject::getId, Function.identity()));
+            for (DegreeRegistration degreeRegistration : dataList) {
+                if (degreeRegistration.getSubjectId() == null) {
+                    continue;
+                }
+                Subject subject = subjectMap.get(degreeRegistration.getSubjectId());
+                if (subject != null) {
+                    degreeRegistration.setSubjectName(subject.getName());
+                }
+            }
+
+
             DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
             pageInfo.setApplyNum(degreeRegistrationDao.countApplyNum(params));
             pageInfo.setTotalAmount(degree.getMoney());

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

@@ -4,14 +4,17 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
+import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.EDegreeStatus;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.tenant.TenantContextHolder;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +50,9 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
     @Autowired
     private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
 
+    @Autowired
+    private OrganizationDao organizationDao;
+
 	/**
      * 查询详情
      * @param id 详情ID
@@ -204,4 +210,46 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
 
         return statistical;
     }
+
+    /**
+     * 学生考级信息查询
+     *
+     * @param id 考级ID
+     * @return DegreeWrapper.StudentDegreeInfo
+     */
+    @Override
+    public DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id) {
+
+        Degree degree = getById(id);
+        // 考级信息不存在
+        if (Objects.isNull(degree)) {
+            throw new BizException("考级信息不存在");
+        }
+
+        Date currentDate = DateTime.now().toDate();
+        // 考级时间不匹配
+        if (degree.getEndTime().before(currentDate)) {
+            throw new BizException("考级报名已经结束");
+        }
+
+        // 考级分部信息
+        DegreeWrapper.StudentDegreeInfo wrapper = DegreeWrapper.StudentDegreeInfo.from(JSON.toJSONString(degree));
+
+        // 分部信息
+        if(StringUtils.isNotEmpty(wrapper.getOrganIds())){
+
+            // 考级分部ID
+            List<Integer> collect = Arrays.stream(wrapper.getOrganIds().split(","))
+                    .mapToInt(Integer::valueOf).boxed()
+                    .collect(Collectors.toList());
+
+            List<Organization> organs = organizationDao.findOrgans(collect);
+
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(organs)) {
+                wrapper.setDegreeCities(JSON.parseArray(JSON.toJSONString(organs), DegreeWrapper.DegreeCity.class));
+            }
+        }
+
+        return wrapper;
+    }
 }

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

@@ -27,6 +27,9 @@
 		<if test="subjectId != null">
 			AND subject_id_ = #{subjectId}
 		</if>
+		<if test="degreeLevelFeeId != null">
+			AND id_ != #{degreeLevelFeeId}
+		</if>
 	</select>
 
 </mapper>

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

@@ -19,6 +19,12 @@
             <if test="param.tenantId != null">
                 and t.tenant_id_ = #{param.tenantId}
             </if>
+		    <if test="param.organId != null">
+                AND FIND_IN_SET(#{param.organId},t.organ_ids_)
+            </if>
+		    <if test="param.degreeStatuses != null">
+                AND t.status_ IN (<foreach collection="param.degreeStatuses" separator="," item="item">#{item}</foreach>)
+            </if>
         </where>
 	</select>
 

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

@@ -16,10 +16,10 @@
 				AND dn.status_ = #{param.status}
 			</if>
 			<if test="param.organId != null">
-				AND (FIND_IN_SET(param.organId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
+				AND (FIND_IN_SET(#{param.organId},dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
 			</if>
 			<if test="param.organId == null and param.defaultOrganId != null and param.defaultOrganId != ''">
-				AND (INTE_ARRAY(param.defaultOrganId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
+				AND (INTE_ARRAY(#{param.defaultOrganId},dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
 			</if>
 		</where>
 		group by dn.id_

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

@@ -24,9 +24,8 @@
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="status_" jdbcType="TINYINT" property="status"/>
-        <result column="certificate_type_" property="certificateType"/>
+        <result column="certificate_type_" property="certificateType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="tenant_id_" property="tenantId" />
-		<result column="type_" property="type" />
 		<result column="type_" property="type"  typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -49,6 +48,9 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
+            <if test="type != null">
+                AND type_ = #{type}
+            </if>
             <if test="status != null">
                 AND status_ = #{status}
             </if>
@@ -58,9 +60,6 @@
             <if test="id != null">
                 AND id_ = #{id}
             </if>
-            <if test="search != null and search != ''">
-                AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%') )
-            </if>
             <if test="orderNo != null">
                 AND order_no_ = #{orderNo}
             </if>
@@ -80,7 +79,11 @@
                 AND city_ LIKE CONCAT('%', #{city},'%')
             </if>
             <if test="subject != null">
-                AND subject_= #{subject}
+                AND subject_ = #{subject}
+            </if>
+
+            <if test="subjectId != null">
+                AND subject_id_= #{subjectId}
             </if>
             <if test="mobile != null">
                 AND mobile_= #{mobile}
@@ -94,6 +97,9 @@
             <if test="endTime != null">
                 <![CDATA[AND DATE_FORMAT(create_time_,"%Y-%m-%d") <= #{endTime}]]>
             </if>
+            <if test="search != null and search != ''">
+                and (user_id_ like concat('%',#{search},'%') or name_ like CONCAT('%',#{search},'%') or mobile_ like CONCAT('%',#{search},'%') )
+            </if>
         </where>
     </sql>
 
@@ -140,7 +146,9 @@
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subjectId},#{level,jdbcType=VARCHAR},
         #{theoryCert,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
-        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT},#{certificateType},#{tenantId},#{type})
+        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT},
+                #{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{tenantId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
     <insert id="batchInsert">
         INSERT INTO degree_registration (user_id_,degree_id_,organ_id_,order_no_, name_, gender_,
@@ -156,7 +164,8 @@
             #{degreeRegistration.subjectId},#{degreeRegistration.level,jdbcType=VARCHAR},
             #{degreeRegistration.theoryCert,jdbcType=VARCHAR},#{degreeRegistration.mobile,jdbcType=VARCHAR},#{degreeRegistration.money,jdbcType=DECIMAL}, #{degreeRegistration.memo,jdbcType=VARCHAR},
             #{degreeRegistration.createTime}, #{degreeRegistration.updateTime}, #{degreeRegistration.status,jdbcType=TINYINT},
-            #{degreeRegistration.certificateType},#{degreeRegistration.tenantId},#{degreeRegistration.type})
+            #{degreeRegistration.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{degreeRegistration.tenantId},#{degreeRegistration.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
@@ -218,7 +227,7 @@
                 status_ = #{status,jdbcType=INTEGER},
             </if>
             <if test="certificateType != null">
-                certificate_type_ = #{certificateType},
+                certificate_type_ = #{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
                 update_time_ = NOW()
         </set>
@@ -284,7 +293,7 @@
                     status_ = #{degree.status,jdbcType=INTEGER},
                 </if>
 	            <if test="degree.certificateType != null">
-	                certificate_type_ = #{degree.certificateType},
+	                certificate_type_ = #{degree.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 	            </if>
                     update_time_ = NOW()
             </set>
@@ -334,4 +343,11 @@
     <select id="findByByOrderId" resultMap="DegreeRegistration">
         SELECT * FROM degree_registration WHERE order_no_ = #{orderNo}
     </select>
+
+    <select id="selectByDegreeId" resultMap="DegreeRegistration">
+        SELECT *
+        FROM degree_registration
+        WHERE degree_id_ = #{degreeId}
+          AND status_ = 1
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/degree/DegreeInfoController.java

@@ -0,0 +1,124 @@
+package com.ym.mec.student.controller.degree;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.collect.Lists;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.EDegreeStatus;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+import com.ym.mec.biz.service.DegreeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degree")
+@Api(tags = "考级信息")
+public class DegreeInfoController extends BaseController {
+
+    @Autowired
+    private DegreeService degreeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "详情", notes = "考级信息-根据详情ID查询单条, 传入id")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<DegreeWrapper.StudentDegreeInfo> detail(@PathVariable("id") Long id) {
+
+        // 登录用户信息
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (Objects.isNull(user) || Objects.isNull(user.getId())){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+
+        // 考级信息
+        DegreeWrapper.StudentDegreeInfo wrapper = degreeService.studentDegreeInfoById(id);
+
+        // 考级机构-暂未开放此活动
+        if (!user.getTenantId().equals(wrapper.getTenantId())) {
+            throw new BizException("暂未开放此活动");
+        }
+
+        // 考级城市-暂未开放此活动
+        boolean noneMatch = Arrays.stream(wrapper.getOrganIds().split(","))
+                .mapToInt(Integer::parseInt).noneMatch(x -> x == user.getOrganId());
+        if (Objects.nonNull(user.getOrganId()) && noneMatch) {
+            throw new BizException("暂未开放此活动");
+        }
+
+        // 查询机构信息
+        return succeed(wrapper);
+    }
+    
+    @ApiOperation(value = "查询分页", notes = "考级信息- 传入 DegreeWrapper.DegreeQuery") 
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<DegreeWrapper.Degree>> page(@RequestBody DegreeWrapper.DegreeQuery query) {
+
+        // 登录用户信息
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (Objects.isNull(user) || Objects.isNull(user.getId())) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+
+        // 设置用户机构ID和城市分部ID
+        query.tenantId(user.getTenantId()).organId(user.getOrganId()).setDegreeStatuses(Lists.newArrayList(EDegreeStatus.END));
+
+        IPage<DegreeWrapper.Degree> pages = degreeService.selectPage(QueryInfo.getPage(query), query);
+
+        // 首页查询时，默认查询进行中，未开始插入首页
+        if (query.getPage() == 1) {
+
+            // 设置分页查询参数
+            query.rows(1000).degreeStatuses(Lists.newArrayList(EDegreeStatus.NOT_START, EDegreeStatus.START));
+
+            // 考级信息
+            Map<EDegreeStatus, List<DegreeWrapper.Degree>> collect = degreeService.selectPage(QueryInfo.getPage(query), query).getRecords().stream()
+                    .collect(Collectors.groupingBy(DegreeWrapper.Degree::getStatus));
+
+            List<DegreeWrapper.Degree> degrees = Lists.newArrayList();
+            // 进行中
+            if (collect.containsKey(EDegreeStatus.START)) {
+                degrees.addAll(collect.get(EDegreeStatus.START).stream()
+                        .sorted(Comparator.comparing(DegreeWrapper.Degree::getStartTime))
+                        .collect(Collectors.toList()));
+            }
+
+            // 未开始
+            if (collect.containsKey(EDegreeStatus.NOT_START)) {
+                degrees.addAll(collect.get(EDegreeStatus.NOT_START).stream()
+                        .sorted(Comparator.comparing(DegreeWrapper.Degree::getStartTime))
+                        .collect(Collectors.toList()));
+            }
+
+            if (CollectionUtils.isNotEmpty(degrees)) {
+                pages.getRecords().addAll(0, degrees);
+            }
+        }
+        
+        return succeed(QueryInfo.pageInfo(pages));
+    }
+}

mec-student/src/main/java/com/ym/mec/student/controller/degree/DegreeLevelFeeController.java

@@ -0,0 +1,69 @@
+package com.ym.mec.student.controller.degree;
+
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+import com.ym.mec.biz.service.DegreeLevelFeeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degreeLevelFee")
+@Api(tags = "考级等级费用配置")
+public class DegreeLevelFeeController extends BaseController {
+
+    @Autowired
+    private DegreeLevelFeeService degreeLevelFeeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation(value = "详情", notes = "考级等级费用配置-根据详情ID查询单条, 传入id")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<DegreeLevelFeeNew> detail(@PathVariable("id") Long id) {
+
+        DegreeLevelFeeNew wrapper = degreeLevelFeeService.detail(id);
+        
+        return succeed(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFeeQuery") 
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<DegreeLevelFeeNewVo>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
+        
+        return succeed(QueryInfo.pageInfo(degreeLevelFeeService.selectPage(QueryInfo.getPage(query), query)));
+	}
+    
+    @ApiOperation(value = "考级费用配置", notes = "考级费用配置查询")
+    @GetMapping("/degreeLevelFeeConfig")
+    public HttpResponseResult<DegreeLevelFeeWrapper.DegreeLevelFee> degreeLevelFeeConfig() {
+
+        // 登录用户信息
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(user)||Objects.isNull(user.getId())){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+
+        // 根据用户机构ID，查询对应考级配置
+        return succeed(degreeLevelFeeService.degreeLevelFeeConfig(user.getTenantId()));
+    }
+}

mec-student/src/main/java/com/ym/mec/student/controller/degree/DegreeNewsController.java

@@ -0,0 +1,52 @@
+package com.ym.mec.student.controller.degree;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.biz.dal.entity.DegreeNews;
+import com.ym.mec.biz.dal.vo.DegreeNewsVo;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.service.DegreeNewsService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degreeNews")
+@Api(tags = "考级资讯表")
+public class DegreeNewsController extends BaseController {
+
+    @Autowired
+    private DegreeNewsService degreeNewsService;
+    @Autowired
+    private SysUserService sysUserService;
+
+	@ApiOperation(value = "详情", notes = "考级资讯表-根据详情ID查询单条, 传入id")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<DegreeNews> detail(@PathVariable("id") Long id) {
+    	DegreeNews wrapper = degreeNewsService.detail(id);
+        return succeed(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery") 
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<DegreeNewsVo>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
+        query.setOrganId(sysUserService.getUser().getOrganId());
+        IPage<DegreeNewsVo> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
+        return succeed(QueryInfo.pageInfo(pages));
+	}
+    
+}

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeLevelFeeController.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -74,7 +75,7 @@ public class DegreeLevelFeeController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/update')")
 	@PostMapping("/update")
 	public HttpResponseResult<JSONObject> update(@RequestBody DegreeLevelFeeNew degreeLevelFee) {
-        degreeLevelFeeService.updateById(degreeLevelFee);
+        degreeLevelFeeService.update(degreeLevelFee);
         return succeed();
 	}